diff options
| author | Jani Laakso <jani.laakso@itmill.com> | 2007-04-05 12:42:31 +0000 |
|---|---|---|
| committer | Jani Laakso <jani.laakso@itmill.com> | 2007-04-05 12:42:31 +0000 |
| commit | 08841bbdc4872931dda6bb11d28816d385fd0f31 (patch) | |
| tree | 3d0614aa7dfbb567c73a1bfd00cbafcd952a2ded /src | |
| parent | eae6579f3543d9004d015015913a9b7c82211c53 (diff) | |
| download | vaadin-framework-08841bbdc4872931dda6bb11d28816d385fd0f31.tar.gz vaadin-framework-08841bbdc4872931dda6bb11d28816d385fd0f31.zip | |
Better sample directory handling for both Tree demos.
svn changeset:1168/svn branch:trunk
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/itmill/toolkit/demo/TreeFilesystem.java | 13 | ||||
| -rw-r--r-- | src/com/itmill/toolkit/demo/TreeFilesystemContainer.java | 9 |
2 files changed, 12 insertions, 10 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); } /** diff --git a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java b/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java index 3297b45d3a..6b2cdbe44f 100644 --- a/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java +++ b/src/com/itmill/toolkit/demo/TreeFilesystemContainer.java @@ -4,6 +4,7 @@ import java.io.File; import com.itmill.toolkit.data.util.FilesystemContainer; import com.itmill.toolkit.data.util.FilesystemContainer.FileItem; +import com.itmill.toolkit.demo.util.SampleDirectory; import com.itmill.toolkit.ui.*; import com.itmill.toolkit.ui.Component.Event; import com.itmill.toolkit.ui.Component.Listener; @@ -22,9 +23,6 @@ import com.itmill.toolkit.ui.Component.Listener; public class TreeFilesystemContainer extends com.itmill.toolkit.Application implements Listener { - // 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"); @@ -58,9 +56,10 @@ public class TreeFilesystemContainer extends com.itmill.toolkit.Application propertyPanel.setEnabled(false); propertyPanel.setWidth(500); + // Get sample directory + File sampleDir = SampleDirectory.getDirectory(this); // Populate tree with FilesystemContainer - FilesystemContainer fsc = new FilesystemContainer(new File(DIR_ROOT), - true); + FilesystemContainer fsc = new FilesystemContainer(sampleDir, true); filesystem.setContainerDataSource(fsc); // "this" handles all filesystem events // e.g. node clicked, expanded etc. |