You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jd...@apache.org on 2011/04/23 09:21:09 UTC
svn commit: r1096113 - in
/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html:
panel/DefaultMarkupSourcingStrategy.java tree/LabelTree.java
tree/LinkTree.java
Author: jdonnerstag
Date: Sat Apr 23 07:21:08 2011
New Revision: 1096113
URL: http://svn.apache.org/viewvc?rev=1096113&view=rev
Log:
fixed: Tree 1.4 to 1.5 migration issue warning
Issue: WICKET-3627
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java?rev=1096113&r1=1096112&r2=1096113&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java Sat Apr 23 07:21:08 2011
@@ -94,33 +94,6 @@ public final class DefaultMarkupSourcing
return markup;
}
- // This is to make migration for Items from 1.4 to 1.5 more easy
- if (Character.isDigit(child.getId().charAt(0)))
- {
- String id = child.getId();
- boolean miss = false;
- for (int i = 1; i < id.length(); i++)
- {
- if (Character.isDigit(id.charAt(i)) == false)
- {
- miss = true;
- break;
- }
- }
-
- if (miss == false)
- {
- // The LoopItems markup is equal to the Loops markup
- markup = container.getMarkup();
-
- if (log.isWarnEnabled())
- {
- log.warn("1.4 to 1.5 migration issue: your item component should be derived from AbstractItem. Item=" +
- child.toString());
- }
- }
- }
-
return markup;
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java?rev=1096113&r1=1096112&r2=1096113&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LabelTree.java Sat Apr 23 07:21:08 2011
@@ -82,7 +82,6 @@ public class LabelTree extends BaseTree
{
return super.newContentComponent(componentId, tree, getNodeTextModel(model));
}
-
};
}
Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java?rev=1096113&r1=1096112&r2=1096113&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/tree/LinkTree.java Sat Apr 23 07:21:08 2011
@@ -106,8 +106,5 @@ public class LinkTree extends LabelTree
*/
protected void onNodeLinkClicked(Object node, BaseTree tree, AjaxRequestTarget target)
{
-
}
-
-
}