You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by eh...@apache.org on 2007/04/13 01:34:04 UTC

svn commit: r528283 - in /incubator/wicket/branches/wicket-1.x: jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/ jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/ jdk-1.4/wicket-extensions...

Author: ehillenius
Date: Thu Apr 12 16:34:01 2007
New Revision: 528283

URL: http://svn.apache.org/viewvc?view=rev&rev=528283
Log:
switch trees, part two

Added:
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/SelectedPathReplacementModel.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/SelectedPathReplacementModel.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree$DefaultNodePanel.html
      - copied unchanged from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/Tree$DefaultNodePanel.html
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.html
      - copied unchanged from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/Tree.html
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/Tree.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/TreeState.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/TreeState.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/blank.gif
      - copied unchanged from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/blank.gif
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/minus.gif
      - copied unchanged from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/minus.gif
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/package.html
      - copied unchanged from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/package.html
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/plus.gif
      - copied unchanged from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/plus.gif
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/tree.css
      - copied unchanged from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/tree.css
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultAbstractTree.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeState.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeStateListener.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/Tree.html
      - copied unchanged from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.html
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/Tree.java
      - copied, changed from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/package.html
      - copied unchanged from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/package.html
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/res/
      - copied from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/res/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/
      - copied from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/
Removed:
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeState.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeStateListener.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.html
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/package.html
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/res/
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/table/
Modified:
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/markup/html/tree/MyTree.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractColumn.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractRenderableColumn.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractTreeColumn.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/ColumnLocation.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IColumn.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IRenderable.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/MiddleColumnsView.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyRenderableColumn.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyTreeColumn.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/SideColumnsView.java
    incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/TreeTable.java
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/EditableTreeTablePage.java
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/SimpleTreePage.java
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/TreeTablePage.java
    incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.markup.html.tree;
+package org.apache.wicket.extensions.markup.html.tree;
 
 import java.util.Enumeration;
 

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/SelectedPathReplacementModel.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/SelectedPathReplacementModel.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/SelectedPathReplacementModel.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/SelectedPathReplacementModel.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/SelectedPathReplacementModel.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/SelectedPathReplacementModel.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/SelectedPathReplacementModel.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.markup.html.tree;
+package org.apache.wicket.extensions.markup.html.tree;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreePath;

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/Tree.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/Tree.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/Tree.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.markup.html.tree;
+package org.apache.wicket.extensions.markup.html.tree;
 
 import java.util.ArrayList;
 import java.util.Enumeration;

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/TreeState.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/TreeState.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/TreeState.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/TreeState.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/TreeState.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/markup/html/tree/TreeState.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/tree/TreeState.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.markup.html.tree;
+package org.apache.wicket.extensions.markup.html.tree;
 
 import java.util.Enumeration;
 import java.util.Hashtable;

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/markup/html/tree/MyTree.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/markup/html/tree/MyTree.java?view=diff&rev=528283&r1=528282&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/markup/html/tree/MyTree.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket-extensions/src/test/java/org/apache/wicket/markup/html/tree/MyTree.java Thu Apr 12 16:34:01 2007
@@ -24,6 +24,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.wicket.ResourceReference;
+import org.apache.wicket.extensions.markup.html.tree.Tree;
 import org.apache.wicket.markup.html.image.Image;
 
 
@@ -57,7 +58,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.markup.html.tree.Tree#junctionLinkClicked(javax.swing.tree.DefaultMutableTreeNode)
+	 * @see org.apache.wicket.extensions.markup.html.tree.Tree#junctionLinkClicked(javax.swing.tree.DefaultMutableTreeNode)
 	 */
 	protected void junctionLinkClicked(DefaultMutableTreeNode node)
 	{
@@ -66,7 +67,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.markup.html.tree.Tree#nodeLinkClicked(javax.swing.tree.DefaultMutableTreeNode)
+	 * @see org.apache.wicket.extensions.markup.html.tree.Tree#nodeLinkClicked(javax.swing.tree.DefaultMutableTreeNode)
 	 */
 	protected void nodeLinkClicked(DefaultMutableTreeNode node)
 	{
@@ -107,7 +108,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.markup.html.tree.Tree#getNodeLabel(javax.swing.tree.DefaultMutableTreeNode)
+	 * @see org.apache.wicket.extensions.markup.html.tree.Tree#getNodeLabel(javax.swing.tree.DefaultMutableTreeNode)
 	 */
 	protected String getNodeLabel(DefaultMutableTreeNode node)
 	{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/AbstractTree.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/AbstractTree.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree;
+package org.apache.wicket.markup.html.tree;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -545,7 +545,7 @@
 	};
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeStateListener#nodeCollapsed(javax.swing.tree.TreeNode)
+	 * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeCollapsed(javax.swing.tree.TreeNode)
 	 */
 	public final void nodeCollapsed(TreeNode node)
 	{
@@ -556,7 +556,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeStateListener#nodeExpanded(javax.swing.tree.TreeNode)
+	 * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeExpanded(javax.swing.tree.TreeNode)
 	 */
 	public final void nodeExpanded(TreeNode node)
 	{
@@ -567,7 +567,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeStateListener#nodeSelected(javax.swing.tree.TreeNode)
+	 * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeSelected(javax.swing.tree.TreeNode)
 	 */
 	public final void nodeSelected(TreeNode node)
 	{
@@ -578,7 +578,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeStateListener#nodeUnselected(javax.swing.tree.TreeNode)
+	 * @see org.apache.wicket.markup.html.tree.ITreeStateListener#nodeUnselected(javax.swing.tree.TreeNode)
 	 */
 	public final void nodeUnselected(TreeNode node)
 	{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultAbstractTree.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultAbstractTree.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultAbstractTree.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultAbstractTree.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultAbstractTree.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree;
+package org.apache.wicket.markup.html.tree;
 
 import java.io.Serializable;
 

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/DefaultTreeState.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/DefaultTreeState.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree;
+package org.apache.wicket.markup.html.tree;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -57,7 +57,7 @@
 	private final Set selectedNodes = new HashSet();
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#addTreeStateListener(org.apache.wicket.extensions.markup.html.tree.ITreeStateListener)
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#addTreeStateListener(org.apache.wicket.markup.html.tree.ITreeStateListener)
 	 */
 	public void addTreeStateListener(ITreeStateListener l)
 	{
@@ -68,7 +68,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#collapseAll()
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#collapseAll()
 	 */
 	public void collapseAll()
 	{
@@ -92,7 +92,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#collapseNode(javax.swing.tree.TreeNode)
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#collapseNode(javax.swing.tree.TreeNode)
 	 */
 	public void collapseNode(TreeNode node)
 	{
@@ -114,7 +114,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#expandAll()
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#expandAll()
 	 */
 	public void expandAll()
 	{
@@ -138,7 +138,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#expandNode(javax.swing.tree.TreeNode)
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#expandNode(javax.swing.tree.TreeNode)
 	 */
 	public void expandNode(TreeNode node)
 	{
@@ -160,7 +160,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#getSelectedNodes()
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#getSelectedNodes()
 	 */
 	public Collection getSelectedNodes()
 	{
@@ -168,7 +168,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#isAllowSelectMultiple()
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#isAllowSelectMultiple()
 	 */
 	public boolean isAllowSelectMultiple()
 	{
@@ -176,7 +176,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#isNodeExpanded(javax.swing.tree.TreeNode)
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#isNodeExpanded(javax.swing.tree.TreeNode)
 	 */
 	public boolean isNodeExpanded(TreeNode node)
 	{
@@ -191,7 +191,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#isNodeSelected(javax.swing.tree.TreeNode)
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#isNodeSelected(javax.swing.tree.TreeNode)
 	 */
 	public boolean isNodeSelected(TreeNode node)
 	{
@@ -199,7 +199,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#removeTreeStateListener(org.apache.wicket.extensions.markup.html.tree.ITreeStateListener)
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#removeTreeStateListener(org.apache.wicket.markup.html.tree.ITreeStateListener)
 	 */
 	public void removeTreeStateListener(ITreeStateListener l)
 	{
@@ -207,7 +207,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#selectNode(javax.swing.tree.TreeNode,
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#selectNode(javax.swing.tree.TreeNode,
 	 *      boolean)
 	 */
 	public void selectNode(TreeNode node, boolean selected)
@@ -249,7 +249,7 @@
 	}
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.ITreeState#setAllowSelectMultiple(boolean)
+	 * @see org.apache.wicket.markup.html.tree.ITreeState#setAllowSelectMultiple(boolean)
 	 */
 	public void setAllowSelectMultiple(boolean value)
 	{

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeState.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeState.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeState.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeState.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree;
+package org.apache.wicket.markup.html.tree;
 
 import java.util.Collection;
 

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeStateListener.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeStateListener.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/ITreeStateListener.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/ITreeStateListener.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree;
+package org.apache.wicket.markup.html.tree;
 
 import javax.swing.tree.TreeNode;
 

Copied: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/Tree.java (from r528277, incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java)
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/Tree.java?view=diff&rev=528283&p1=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java&r1=528277&p2=incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/Tree.java&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/extensions/markup/html/tree/Tree.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/Tree.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree;
+package org.apache.wicket.markup.html.tree;
 
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreeNode;

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractColumn.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractColumn.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractColumn.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractColumn.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import javax.swing.tree.TreeNode;
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractRenderableColumn.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractRenderableColumn.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractRenderableColumn.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractRenderableColumn.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import javax.swing.tree.TreeNode;
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractTreeColumn.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractTreeColumn.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractTreeColumn.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/AbstractTreeColumn.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import javax.swing.tree.TreeNode;
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/ColumnLocation.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/ColumnLocation.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/ColumnLocation.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/ColumnLocation.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import org.apache.wicket.IClusterable;
 import org.apache.wicket.util.lang.EnumeratedType;

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IColumn.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IColumn.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IColumn.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IColumn.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import javax.swing.tree.TreeNode;
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IRenderable.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IRenderable.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IRenderable.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/IRenderable.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import javax.swing.tree.TreeNode;
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/MiddleColumnsView.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/MiddleColumnsView.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/MiddleColumnsView.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/MiddleColumnsView.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
@@ -28,9 +28,9 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.RequestCycle;
 import org.apache.wicket.Response;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Unit;
 import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation.Unit;
 import org.apache.wicket.response.NullResponse;
 
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyRenderableColumn.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyRenderableColumn.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyRenderableColumn.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyRenderableColumn.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import java.util.Locale;
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyTreeColumn.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyTreeColumn.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyTreeColumn.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/PropertyTreeColumn.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import java.util.Locale;
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/SideColumnsView.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/SideColumnsView.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/SideColumnsView.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/SideColumnsView.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,10 +24,10 @@
 import org.apache.wicket.Component;
 import org.apache.wicket.RequestCycle;
 import org.apache.wicket.Response;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Unit;
 import org.apache.wicket.markup.MarkupStream;
 import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation.Alignment;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation.Unit;
 
 
 /**

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/TreeTable.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/TreeTable.java?view=diff&rev=528283&r1=528277&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/TreeTable.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/tree/table/TreeTable.java Thu Apr 12 16:34:01 2007
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.wicket.extensions.markup.html.tree.table;
+package org.apache.wicket.markup.html.tree.table;
 
 import javax.swing.tree.TreeModel;
 import javax.swing.tree.TreeNode;
@@ -24,13 +24,13 @@
 import org.apache.wicket.MarkupContainer;
 import org.apache.wicket.ResourceReference;
 import org.apache.wicket.behavior.AbstractBehavior;
-import org.apache.wicket.extensions.markup.html.tree.AbstractTree;
-import org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.tree.AbstractTree;
+import org.apache.wicket.markup.html.tree.DefaultAbstractTree;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation.Alignment;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
@@ -242,7 +242,7 @@
 	};
 
 	/**
-	 * @see org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree#getCSS()
+	 * @see org.apache.wicket.markup.html.tree.DefaultAbstractTree#getCSS()
 	 */
 	protected ResourceReference getCSS()
 	{

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java?view=diff&rev=528283&r1=528282&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/BaseTreePage.java Thu Apr 12 16:34:01 2007
@@ -27,12 +27,12 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.examples.ajax.builtin.BasePage;
-import org.apache.wicket.extensions.markup.html.tree.AbstractTree;
+import org.apache.wicket.markup.html.tree.AbstractTree;
 
 
 /**
  * This is a base class for all pages with tree example.
- *  
+ * 
  * @author Matej Knopp
  */
 public abstract class BaseTreePage extends BasePage
@@ -42,8 +42,8 @@
 	 * Default constructor
 	 */
 	public BaseTreePage()
-	{				
-		add(new AjaxLink("expandAll") 
+	{
+		add(new AjaxLink("expandAll")
 		{
 			public void onClick(AjaxRequestTarget target)
 			{
@@ -51,8 +51,8 @@
 				getTree().updateTree(target);
 			}
 		});
-		
-		add(new AjaxLink("collapseAll") 
+
+		add(new AjaxLink("collapseAll")
 		{
 			public void onClick(AjaxRequestTarget target)
 			{
@@ -60,8 +60,8 @@
 				getTree().updateTree(target);
 			}
 		});
-		
-		add(new AjaxLink("switchRootless") 
+
+		add(new AjaxLink("switchRootless")
 		{
 			public void onClick(AjaxRequestTarget target)
 			{
@@ -72,20 +72,19 @@
 	}
 
 	/**
-	 * Returns the tree on this pages. This is used to collapse, expand the tree 
+	 * Returns the tree on this pages. This is used to collapse, expand the tree
 	 * and to switch the rootless mode.
 	 * 
-	 * @return
-	 * 		Tree instance on this page
+	 * @return Tree instance on this page
 	 */
 	protected abstract AbstractTree getTree();
-	
+
 	/**
 	 * Creates the model that feeds the tree.
-	 * @return
-	 * 		New instance of tree model.
+	 * 
+	 * @return New instance of tree model.
 	 */
-	protected TreeModel createTreeModel() 
+	protected TreeModel createTreeModel()
 	{
 		List l1 = new ArrayList();
 		l1.add("test 1.1");
@@ -99,19 +98,19 @@
 		l3.add("test 3.1");
 		l3.add("test 3.2");
 		l3.add("test 3.3");
-				
+
 		l2.add(l3);
-		
+
 		l2.add("test 2.4");
 		l2.add("test 2.5");
 		l2.add("test 2.6");
-		
+
 		l3 = new ArrayList();
 		l3.add("test 3.1");
 		l3.add("test 3.2");
 		l3.add("test 3.3");
 		l2.add(l3);
-		
+
 		l1.add(l2);
 
 		l2 = new ArrayList();
@@ -119,21 +118,21 @@
 		l2.add("test 2.2");
 		l2.add("test 2.3");
 
-		l1.add(l2);		
-		
+		l1.add(l2);
+
 		l1.add("test 1.3");
 		l1.add("test 1.4");
 		l1.add("test 1.5");
-		
+
 		return convertToTreeModel(l1);
 	}
-	
+
 	private TreeModel convertToTreeModel(List list)
 	{
 		TreeModel model = null;
 		DefaultMutableTreeNode rootNode = new DefaultMutableTreeNode(new ModelBean("ROOT"));
 		add(rootNode, list);
-		model = new DefaultTreeModel(rootNode);		
+		model = new DefaultTreeModel(rootNode);
 		return model;
 	}
 
@@ -144,16 +143,18 @@
 			Object o = i.next();
 			if (o instanceof List)
 			{
-				DefaultMutableTreeNode child = new DefaultMutableTreeNode(new ModelBean("subtree..."));
+				DefaultMutableTreeNode child = new DefaultMutableTreeNode(new ModelBean(
+						"subtree..."));
 				parent.add(child);
 				add(child, (List)o);
 			}
 			else
 			{
-				DefaultMutableTreeNode child = new DefaultMutableTreeNode(new ModelBean(o.toString()));
+				DefaultMutableTreeNode child = new DefaultMutableTreeNode(new ModelBean(o
+						.toString()));
 				parent.add(child);
 			}
 		}
 	}
-	
+
 }

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/EditableTreeTablePage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/EditableTreeTablePage.java?view=diff&rev=528283&r1=528282&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/EditableTreeTablePage.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/EditableTreeTablePage.java Thu Apr 12 16:34:01 2007
@@ -16,19 +16,19 @@
  */
 package org.apache.wicket.examples.ajax.builtin.tree;
 
-import org.apache.wicket.extensions.markup.html.tree.AbstractTree;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation;
-import org.apache.wicket.extensions.markup.html.tree.table.IColumn;
-import org.apache.wicket.extensions.markup.html.tree.table.PropertyTreeColumn;
-import org.apache.wicket.extensions.markup.html.tree.table.TreeTable;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Unit;
 import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.tree.AbstractTree;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation;
+import org.apache.wicket.markup.html.tree.table.IColumn;
+import org.apache.wicket.markup.html.tree.table.PropertyTreeColumn;
+import org.apache.wicket.markup.html.tree.table.TreeTable;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation.Alignment;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation.Unit;
 
 
 /**
  * Page that shows a tree table with editable cells.
- *  
+ * 
  * @author Matej Knopp
  */
 public class EditableTreeTablePage extends BaseTreePage
@@ -38,26 +38,32 @@
 	/**
 	 * Page constructor.
 	 */
-	public EditableTreeTablePage()	
+	public EditableTreeTablePage()
 	{
 		IColumn columns[] = new IColumn[] {
-			new PropertyTreeColumn(new ColumnLocation(Alignment.LEFT, 18, Unit.EM), "Tree Column", "userObject.property1"),
-			new PropertyEditableColumn(new ColumnLocation(Alignment.LEFT, 12, Unit.EM), "L2", "userObject.property2"),
-			new PropertyEditableColumn(new ColumnLocation(Alignment.MIDDLE, 2, Unit.PROPORTIONAL), "M1", "userObject.property3"),
-			new PropertyEditableColumn(new ColumnLocation(Alignment.MIDDLE, 2, Unit.PROPORTIONAL), "M2", "userObject.property4"),
-			new PropertyEditableColumn(new ColumnLocation(Alignment.MIDDLE, 3, Unit.PROPORTIONAL), "M3", "userObject.property5"),
-			new PropertyEditableColumn(new ColumnLocation(Alignment.RIGHT, 8, Unit.EM), "R1", "userObject.property6"),
-			
+				new PropertyTreeColumn(new ColumnLocation(Alignment.LEFT, 18, Unit.EM),
+						"Tree Column", "userObject.property1"),
+				new PropertyEditableColumn(new ColumnLocation(Alignment.LEFT, 12, Unit.EM), "L2",
+						"userObject.property2"),
+				new PropertyEditableColumn(new ColumnLocation(Alignment.MIDDLE, 2,
+						Unit.PROPORTIONAL), "M1", "userObject.property3"),
+				new PropertyEditableColumn(new ColumnLocation(Alignment.MIDDLE, 2,
+						Unit.PROPORTIONAL), "M2", "userObject.property4"),
+				new PropertyEditableColumn(new ColumnLocation(Alignment.MIDDLE, 3,
+						Unit.PROPORTIONAL), "M3", "userObject.property5"),
+				new PropertyEditableColumn(new ColumnLocation(Alignment.RIGHT, 8, Unit.EM), "R1",
+						"userObject.property6"),
+
 		};
-		
+
 		Form form = new Form("form");
 		add(form);
-		
+
 		tree = new TreeTable("treeTable", createTreeModel(), columns);
 		form.add(tree);
 		tree.getTreeState().collapseAll();
 	}
-	
+
 	/**
 	 * @see BaseTreePage#getTree()
 	 */

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java?view=diff&rev=528283&r1=528282&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/PropertyEditableColumn.java Thu Apr 12 16:34:01 2007
@@ -20,10 +20,10 @@
 
 import org.apache.wicket.Component;
 import org.apache.wicket.MarkupContainer;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation;
-import org.apache.wicket.extensions.markup.html.tree.table.IColumn;
-import org.apache.wicket.extensions.markup.html.tree.table.IRenderable;
-import org.apache.wicket.extensions.markup.html.tree.table.PropertyRenderableColumn;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation;
+import org.apache.wicket.markup.html.tree.table.IColumn;
+import org.apache.wicket.markup.html.tree.table.IRenderable;
+import org.apache.wicket.markup.html.tree.table.PropertyRenderableColumn;
 import org.apache.wicket.model.PropertyModel;
 
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/SimpleTreePage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/SimpleTreePage.java?view=diff&rev=528283&r1=528282&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/SimpleTreePage.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/SimpleTreePage.java Thu Apr 12 16:34:01 2007
@@ -19,15 +19,15 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeNode;
 
-import org.apache.wicket.extensions.markup.html.tree.AbstractTree;
-import org.apache.wicket.extensions.markup.html.tree.Tree;
+import org.apache.wicket.markup.html.tree.AbstractTree;
+import org.apache.wicket.markup.html.tree.Tree;
 
 
 /**
  * Page that shuws a simple tree (not a table).
- *  
+ * 
  * @author Matej
- *
+ * 
  */
 public class SimpleTreePage extends BaseTreePage
 {
@@ -37,22 +37,22 @@
 	{
 		return tree;
 	}
-	
+
 	/**
 	 * Page constructor
-	 *
+	 * 
 	 */
 	public SimpleTreePage()
 	{
-		tree = new Tree("tree", createTreeModel()) 
+		tree = new Tree("tree", createTreeModel())
 		{
 			protected String renderNode(TreeNode node)
 			{
-				ModelBean bean = (ModelBean) ((DefaultMutableTreeNode)node).getUserObject();
+				ModelBean bean = (ModelBean)((DefaultMutableTreeNode)node).getUserObject();
 				return bean.getProperty1();
 			}
 		};
-		add(tree);		
+		add(tree);
 		tree.getTreeState().collapseAll();
 	}
 

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/TreeTablePage.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/TreeTablePage.java?view=diff&rev=528283&r1=528282&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/TreeTablePage.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/tree/TreeTablePage.java Thu Apr 12 16:34:01 2007
@@ -16,18 +16,18 @@
  */
 package org.apache.wicket.examples.ajax.builtin.tree;
 
-import org.apache.wicket.extensions.markup.html.tree.AbstractTree;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation;
-import org.apache.wicket.extensions.markup.html.tree.table.IColumn;
-import org.apache.wicket.extensions.markup.html.tree.table.PropertyRenderableColumn;
-import org.apache.wicket.extensions.markup.html.tree.table.PropertyTreeColumn;
-import org.apache.wicket.extensions.markup.html.tree.table.TreeTable;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Alignment;
-import org.apache.wicket.extensions.markup.html.tree.table.ColumnLocation.Unit;
+import org.apache.wicket.markup.html.tree.AbstractTree;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation;
+import org.apache.wicket.markup.html.tree.table.IColumn;
+import org.apache.wicket.markup.html.tree.table.PropertyRenderableColumn;
+import org.apache.wicket.markup.html.tree.table.PropertyTreeColumn;
+import org.apache.wicket.markup.html.tree.table.TreeTable;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation.Alignment;
+import org.apache.wicket.markup.html.tree.table.ColumnLocation.Unit;
 
 /**
  * Page that shows a simple tree table.
- *  
+ * 
  * @author Matej Knopp
  */
 public class TreeTablePage extends BaseTreePage
@@ -37,23 +37,28 @@
 	/**
 	 * Page constructor.
 	 */
-	public TreeTablePage()	
+	public TreeTablePage()
 	{
 		IColumn columns[] = new IColumn[] {
-			new PropertyTreeColumn(new ColumnLocation(Alignment.MIDDLE, 8, Unit.PROPORTIONAL), "Tree Column (middle)", "userObject.property1"),
-			new PropertyRenderableColumn(new ColumnLocation(Alignment.LEFT, 7, Unit.EM), "L2", "userObject.property2"),
-			new PropertyRenderableColumn(new ColumnLocation(Alignment.MIDDLE, 2, Unit.PROPORTIONAL), "M1", "userObject.property3"),
-			new PropertyRenderableColumn(new ColumnLocation(Alignment.MIDDLE, 2, Unit.PROPORTIONAL), "M2", "userObject.property4"),
-			new PropertyRenderableColumn(new ColumnLocation(Alignment.MIDDLE, 3, Unit.PROPORTIONAL), "M3", "userObject.property5"),
-			new PropertyRenderableColumn(new ColumnLocation(Alignment.RIGHT, 8, Unit.EM), "R1", "userObject.property6"),			
-		};
-		
+				new PropertyTreeColumn(new ColumnLocation(Alignment.MIDDLE, 8, Unit.PROPORTIONAL),
+						"Tree Column (middle)", "userObject.property1"),
+				new PropertyRenderableColumn(new ColumnLocation(Alignment.LEFT, 7, Unit.EM), "L2",
+						"userObject.property2"),
+				new PropertyRenderableColumn(new ColumnLocation(Alignment.MIDDLE, 2,
+						Unit.PROPORTIONAL), "M1", "userObject.property3"),
+				new PropertyRenderableColumn(new ColumnLocation(Alignment.MIDDLE, 2,
+						Unit.PROPORTIONAL), "M2", "userObject.property4"),
+				new PropertyRenderableColumn(new ColumnLocation(Alignment.MIDDLE, 3,
+						Unit.PROPORTIONAL), "M3", "userObject.property5"),
+				new PropertyRenderableColumn(new ColumnLocation(Alignment.RIGHT, 8, Unit.EM), "R1",
+						"userObject.property6"), };
+
 		tree = new TreeTable("treeTable", createTreeModel(), columns);
 		tree.getTreeState().setAllowSelectMultiple(true);
 		add(tree);
 		tree.getTreeState().collapseAll();
 	}
-	
+
 	protected AbstractTree getTree()
 	{
 		return tree;

Modified: incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java
URL: http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java?view=diff&rev=528283&r1=528282&r2=528283
==============================================================================
--- incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java (original)
+++ incubator/wicket/branches/wicket-1.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/nested/Home.java Thu Apr 12 16:34:01 2007
@@ -28,10 +28,10 @@
 import org.apache.wicket.PageParameters;
 import org.apache.wicket.examples.WicketExamplePage;
 import org.apache.wicket.examples.ajax.builtin.tree.SimpleTreePage;
-import org.apache.wicket.extensions.markup.html.tree.Tree;
-import org.apache.wicket.extensions.markup.html.tree.DefaultAbstractTree.LinkType;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.tree.Tree;
+import org.apache.wicket.markup.html.tree.DefaultAbstractTree.LinkType;
 
 
 /**
@@ -75,15 +75,15 @@
 		{
 			protected String renderNode(TreeNode node)
 			{
-				DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) node;				 
+				DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode)node;
 				Object userObject = treeNode.getUserObject();
-				return (userObject instanceof List) ? "<subtree>" : String
-						.valueOf(treeNode.getUserObject());
+				return (userObject instanceof List) ? "<subtree>" : String.valueOf(treeNode
+						.getUserObject());
 			}
 		};
 		// disable ajax links in this example
 		tree.setLinkType(LinkType.REGULAR);
-		
+
 		add(tree);
 		add(new Link("expandAll")
 		{
@@ -100,7 +100,7 @@
 				tree.getTreeState().collapseAll();
 			}
 		});
-		
+
 		add(new BookmarkablePageLink("ajaxTreeLink", SimpleTreePage.class));
 	}