From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Mon, 4 Jan 2010 10:23:47 +0000 (+0000)
Subject: fixes #3864, folders now also returned in getItemIds()
X-Git-Tag: 6.7.0.beta1~2084^2~5
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=145cb5a985ca4b21ce29fca6eed2827d26f9cb98;p=vaadin-framework.git

fixes #3864, folders now also returned in getItemIds()

svn changeset:10606/svn branch:6.2
---

diff --git a/src/com/vaadin/data/util/FilesystemContainer.java b/src/com/vaadin/data/util/FilesystemContainer.java
index 126e2237dd..758c1444de 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 i = ll.iterator(); i.hasNext();) {
             final File lf = (File) i.next();
+            col.add(lf);
             if (lf.isDirectory()) {
                 addItemIds(col, lf);
-            } else {
-                col.add(lf);
             }
         }
     }