Better sample directory handling for both Tree demos.

svn changeset:1168/svn branch:trunk

1 files changed, 8 insertions, 5 deletions

diff --git a/src/com/itmill/toolkit/demo/TreeFilesystem.java b/src/com/itmill/toolkit/demo/TreeFilesystem.java
index 11c0bdf543..25c317ee42 100644
--- a/src/com/itmill/toolkit/demo/TreeFilesystem.java
+++ b/src/com/itmill/toolkit/demo/TreeFilesystem.java
@@ -2,6 +2,8 @@ package com.itmill.toolkit.demo;
 
 import java.io.File;
 import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.data.util.FilesystemContainer;
+import com.itmill.toolkit.demo.util.SampleDirectory;
 import com.itmill.toolkit.ui.*;
 import com.itmill.toolkit.ui.Tree.ExpandEvent;
 
@@ -18,9 +20,6 @@ import com.itmill.toolkit.ui.Tree.ExpandEvent;
 public class TreeFilesystem extends com.itmill.toolkit.Application implements
 		Tree.ExpandListener {
 
-	// Default is root directory, e.g. / on unix or \ on windows
-	private static final String DIR_ROOT = "" + File.separatorChar;
-
 	// Filesystem explorer panel and it's components
 	private Panel explorerPanel = new Panel("Filesystem explorer");
 
@@ -43,8 +42,12 @@ public class TreeFilesystem extends com.itmill.toolkit.Application implements
 
 		// "this" handles tree's expand event
 		tree.addListener((Tree.ExpandListener) this);
-		// populate tree's root node
-		populateNode(DIR_ROOT, null);
+
+		// Get sample directory
+		File sampleDir = SampleDirectory.getDirectory(this);
+		// populate tree's root node with example directory
+		if (sampleDir != null)
+			populateNode(sampleDir.getAbsolutePath(), null);
 	}
 
 	/**