diff options
| author | Henri Sara <henri.sara@itmill.com> | 2010-01-05 07:55:14 +0000 |
|---|---|---|
| committer | Henri Sara <henri.sara@itmill.com> | 2010-01-05 07:55:14 +0000 |
| commit | 7faf0d2de1692e410558f38bce46965981cca1a6 (patch) | |
| tree | ebd1b78990770795f6e9b89627696b9b785fc5c0 /src/com/vaadin/data/util/FilesystemContainer.java | |
| parent | 0b4d8a15ddcfa075212f5b0f4602b90d6d8351fa (diff) | |
| parent | c1cc0a1d9db4f1bc3e9f0ae6b4b634a7b5aae89d (diff) | |
| download | vaadin-framework-7faf0d2de1692e410558f38bce46965981cca1a6.tar.gz vaadin-framework-7faf0d2de1692e410558f38bce46965981cca1a6.zip | |
Merge from 6.2 to 6.3
svn changeset:10625/svn branch:6.3
Diffstat (limited to 'src/com/vaadin/data/util/FilesystemContainer.java')
| -rw-r--r-- | src/com/vaadin/data/util/FilesystemContainer.java | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/com/vaadin/data/util/FilesystemContainer.java b/src/com/vaadin/data/util/FilesystemContainer.java index adcfcfe3a7..1c9671d52d 100644 --- a/src/com/vaadin/data/util/FilesystemContainer.java +++ b/src/com/vaadin/data/util/FilesystemContainer.java @@ -32,10 +32,6 @@ import com.vaadin.terminal.Resource; * @VERSION@ * @since 3.0 */ -/** - * @author mattitahvonen - * - */ @SuppressWarnings("serial") public class FilesystemContainer implements Container.Hierarchical { @@ -404,10 +400,9 @@ public class FilesystemContainer implements Container.Hierarchical { for (final Iterator<File> i = ll.iterator(); i.hasNext();) { final File lf = i.next(); + col.add(lf); if (lf.isDirectory()) { addItemIds(col, lf); - } else { - col.add(lf); } } } |