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 2007/04/29 22:23:46 UTC
svn commit: r533555 - in /incubator/wicket/trunk/jdk-1.4/wicket/src:
main/java/org/apache/wicket/markup/parser/filter/
test/java/org/apache/wicket/markup/html/basic/
Author: jdonnerstag
Date: Sun Apr 29 13:23:45 2007
New Revision: 533555
URL: http://svn.apache.org/viewvc?view=rev&rev=533555
Log:
wicket-444: src attribute path not processed by wicket for INPUT type=image and any IMG with wicket:message in it
fixed and junit tests added
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html
incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java?view=diff&rev=533555&r1=533554&r2=533555
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/PrependContextPathHandler.java Sun Apr 29 13:23:45 2007
@@ -100,13 +100,14 @@
{
// Get the next tag. If null, no more tags are available
final ComponentTag tag = (ComponentTag)getParent().nextTag();
- if (tag == null || tag.getId() != null)
+ if ((tag == null) || tag.isClose())
{
return tag;
}
// Don't touch any wicket:id component
- if (tag.getId() != null)
+ if ((tag.getId() != null)
+ && (tag.getId().equals(WicketMessageTagHandler.WICKET_MESSAGE_CONTAINER_ID) == false))
{
return tag;
}
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java?view=diff&rev=533555&r1=533554&r2=533555
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/parser/filter/WicketMessageTagHandler.java Sun Apr 29 13:23:45 2007
@@ -50,9 +50,7 @@
implements
IComponentResolver
{
- /**
- *
- */
+ /** */
private static final long serialVersionUID = 1L;
/** TODO Post 1.2: General: Namespace should not be a constant */
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html?view=diff&rev=533555&r1=533554&r2=533555
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePageExpectedResult_7.html Sun Apr 29 13:23:45 2007
@@ -6,5 +6,9 @@
<wicket:message key="myKey">myValue</wicket:message>
<span wicket:id="message">here it goes</span>
<span wicket:message="attr-name:i18n-key" attr-name="my i18n key">test 2</span>
+ <span wicket:message="attr-name:i18n-key" attr-name="my i18n key" wicket:id="message2">here it goes</span>
+
+ <input src="/WicketTester$DummyWebApplication/test.gif" type="image">test 2</input>
+ <input wicket:message="attr-name:i18n-key" attr-name="my i18n key" src="/WicketTester$DummyWebApplication/test.gif" type="image">test 2</input>
</body>
</html>
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html?view=diff&rev=533555&r1=533554&r2=533555
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.html Sun Apr 29 13:23:45 2007
@@ -6,5 +6,9 @@
<wicket:message key="myKey"/>
<span wicket:id="message">test</span>
<span wicket:message="attr-name:i18n-key">test 2</span>
+ <span wicket:id="message2" wicket:message="attr-name:i18n-key">test 2</span>
+
+ <input type="image" src=test.gif">test 2</input>
+ <input type="image" src="test.gif" wicket:message="attr-name:i18n-key">test 2</input>
</body>
</html>
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.java?view=diff&rev=533555&r1=533554&r2=533555
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_7.java Sun Apr 29 13:23:45 2007
@@ -34,5 +34,6 @@
public SimplePage_7()
{
add(new Label("message", "here it goes"));
+ add(new Label("message2", "here it goes"));
}
}