You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2014/09/19 16:54:57 UTC
git commit: Removed old code tu support migration from 1.4 to 1.5
Repository: wicket
Updated Branches:
refs/heads/master 087c0a26c -> f89b15618
Removed old code tu support migration from 1.4 to 1.5
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f89b1561
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f89b1561
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f89b1561
Branch: refs/heads/master
Commit: f89b15618243075f8a8e90cb826550af525dabb7
Parents: 087c0a2
Author: adelbene <an...@gmail.com>
Authored: Fri Sep 19 16:53:48 2014 +0200
Committer: adelbene <an...@gmail.com>
Committed: Fri Sep 19 16:53:48 2014 +0200
----------------------------------------------------------------------
.../panel/DefaultMarkupSourcingStrategy.java | 43 +-------------------
1 file changed, 1 insertion(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f89b1561/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
index a180dae..6ba5b61 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
@@ -21,7 +21,6 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.IMarkupFragment;
import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.html.list.AbstractItem;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,47 +97,7 @@ public final class DefaultMarkupSourcingStrategy extends AbstractMarkupSourcingS
}
markup = searchMarkupInTransparentResolvers(container, child);
- if (markup != null)
- {
- 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 (!(child instanceof AbstractItem) && log.isWarnEnabled())
- {
- log.warn("1.4 to 1.5 migration issue: the childs wicket-id contains decimals only. " +
- "By convention that " +
- "is only the case for children (Items) of Loop, ListView, " +
- "Tree etc.. To avoid the warning, the childs container should implement:\n" +
- "@Override public IMarkupFragment getMarkup(Component child) {\n" +
- "// The childs markup is always equal to the parents markup.\n" +
- "return getMarkup(); }\n" +
- "Child: " +
- child.toString() +
- "\nContainer: " +
- container.toString());
- }
- }
- }
-
+
return markup;
}
}