From c518ac733f556cdc9061d132edb4a2e6461b2ec3 Mon Sep 17 00:00:00 2001
From: Henri Sara <hesara@vaadin.com>
Date: Thu, 5 Apr 2012 09:34:00 +0300
Subject: [PATCH] Moved Collapsible and HierarchicalContainerOrderedWrapper to
 data packages (related to #8440) - should not be specific to TreeTable.

Otherwise, having a package and a class by the same name causes problems
when trying to compile a widgetset on systems that do not treat file
names as case sensitive.
---
 .../vaadin/{ui/treetable => data}/Collapsible.java   |  7 +++----
 .../util}/HierarchicalContainerOrderedWrapper.java   | 12 +++++++-----
 src/com/vaadin/ui/TreeTable.java                     |  4 ++--
 3 files changed, 12 insertions(+), 11 deletions(-)
 rename src/com/vaadin/{ui/treetable => data}/Collapsible.java (95%)
 rename src/com/vaadin/{ui/treetable => data/util}/HierarchicalContainerOrderedWrapper.java (83%)

diff --git a/src/com/vaadin/ui/treetable/Collapsible.java b/src/com/vaadin/data/Collapsible.java
similarity index 95%
rename from src/com/vaadin/ui/treetable/Collapsible.java
rename to src/com/vaadin/data/Collapsible.java
index bec0ba9ae9..06c96b7ea7 100644
--- a/src/com/vaadin/ui/treetable/Collapsible.java
+++ b/src/com/vaadin/data/Collapsible.java
@@ -1,15 +1,14 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.ui.treetable;
+package com.vaadin.data;
 
-import com.vaadin.data.Container;
 import com.vaadin.data.Container.Hierarchical;
 import com.vaadin.data.Container.Ordered;
-import com.vaadin.data.Item;
 
 /**
- * Container needed by large lazy loading hierarchies displayed in TreeTable.
+ * Container needed by large lazy loading hierarchies displayed e.g. in
+ * TreeTable.
  * <p>
  * Container of this type gets notified when a subtree is opened/closed in a
  * component displaying its content. This allows container to lazy load subtrees
diff --git a/src/com/vaadin/ui/treetable/HierarchicalContainerOrderedWrapper.java b/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java
similarity index 83%
rename from src/com/vaadin/ui/treetable/HierarchicalContainerOrderedWrapper.java
rename to src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java
index f826c59bf7..b7eac3e378 100644
--- a/src/com/vaadin/ui/treetable/HierarchicalContainerOrderedWrapper.java
+++ b/src/com/vaadin/data/util/HierarchicalContainerOrderedWrapper.java
@@ -1,18 +1,20 @@
 /*
 @VaadinApache2LicenseForJavaFiles@
  */
-package com.vaadin.ui.treetable;
+package com.vaadin.data.util;
 
 import java.util.Collection;
 
 import com.vaadin.data.Container.Hierarchical;
-import com.vaadin.data.util.ContainerOrderedWrapper;
 
-@SuppressWarnings({ "serial", "unchecked" })
 /**
- * Helper for TreeTable. Does the same thing as ContainerOrderedWrapper 
- * to fit into table but retains Hierarchical feature.
+ * A wrapper class for adding external ordering to containers not implementing
+ * the {@link com.vaadin.data.Container.Ordered} interface while retaining
+ * {@link Hierarchical} features.
+ * 
+ * @see ContainerOrderedWrapper
  */
+@SuppressWarnings({ "serial" })
 public class HierarchicalContainerOrderedWrapper extends
         ContainerOrderedWrapper implements Hierarchical {
 
diff --git a/src/com/vaadin/ui/TreeTable.java b/src/com/vaadin/ui/TreeTable.java
index 3fe080787a..f920810edf 100644
--- a/src/com/vaadin/ui/TreeTable.java
+++ b/src/com/vaadin/ui/TreeTable.java
@@ -13,11 +13,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
+import com.vaadin.data.Collapsible;
 import com.vaadin.data.Container;
 import com.vaadin.data.Container.Hierarchical;
 import com.vaadin.data.Container.ItemSetChangeEvent;
 import com.vaadin.data.util.ContainerHierarchicalWrapper;
 import com.vaadin.data.util.HierarchicalContainer;
+import com.vaadin.data.util.HierarchicalContainerOrderedWrapper;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
@@ -26,8 +28,6 @@ import com.vaadin.ui.Tree.CollapseEvent;
 import com.vaadin.ui.Tree.CollapseListener;
 import com.vaadin.ui.Tree.ExpandEvent;
 import com.vaadin.ui.Tree.ExpandListener;
-import com.vaadin.ui.treetable.Collapsible;
-import com.vaadin.ui.treetable.HierarchicalContainerOrderedWrapper;
 
 /**
  * TreeTable extends the {@link Table} component so that it can also visualize a
-- 
2.39.5