Author: jdonnerstag
Date: Fri Oct 26 16:05:38 2007
New Revision: 588790
URL: http://svn.apache.org/viewvc?rev=588790&view=rev
Log:
fixed Martjin problem with wicket:message
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.html
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.java
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.properties
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.html
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.java
(with props)
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.properties
(with props)
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java?rev=588790&r1=588789&r2=588790&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/resolver/WicketMessageResolver.java
Fri Oct 26 16:05:38 2007
@@ -125,7 +125,7 @@
protected void onComponentTagBody(MarkupStream markupStream,
ComponentTag openTag)
{
final String key = getModelObjectAsString();
- final String value = getLocalizer().getString(key,
this, DEFAULT_VALUE);
+ final String value = getLocalizer().getString(key,
getParent(), DEFAULT_VALUE);
if (value != null && !DEFAULT_VALUE.equals(value))
{
replaceComponentTagBody(markupStream, openTag,
value.trim());
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html?rev=588790&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html
Fri Oct 26 16:05:38 2007
@@ -0,0 +1,25 @@
+<!--
+ ====================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html xmlns:wicket>
+<body>
+ <span wicket:id="myPanel3"><wicket:panel>
+<table>
+<tr><td>Foo1</td><td><wicket:message key="foo1">panel.foo1 from
page.properties</wicket:message></td></tr>
+<tr><td>Foo2</td><td><wicket:message key="foo2">panel.foo2 from
page.properties</wicket:message></td></tr>
+<tr><td>Foo3</td><td><wicket:message key="foo3">foo3 from
page.properties</wicket:message></td></tr>
+</table>
+</wicket:panel></span>
+</body>
+</html>
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPageExpectedResult_3.html
------------------------------------------------------------------------------
svn:eol-style = native
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.html?rev=588790&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.html
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.html
Fri Oct 26 16:05:38 2007
@@ -0,0 +1,19 @@
+<!--
+ ====================================================================
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<html xmlns:wicket>
+<body>
+ <span wicket:id="myPanel3">panel</span>
+</body>
+</html>
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.html
------------------------------------------------------------------------------
svn:eol-style = native
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.java?rev=588790&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.java
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.java
Fri Oct 26 16:05:38 2007
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.panel;
+
+import org.apache.wicket.markup.html.WebPage;
+
+
+/**
+ * Mock page for testing.
+ *
+ * @author Chris Turner
+ */
+public class PanelPage_3 extends WebPage
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ *
+ */
+ public PanelPage_3()
+ {
+ Panel panel = new SimplePanel_3("myPanel3");
+ add(panel);
+ }
+}
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.properties
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.properties?rev=588790&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.properties
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.properties
Fri Oct 26 16:05:38 2007
@@ -0,0 +1,4 @@
+myPanel3.foo1=panel.foo1 from page.properties
+myPanel3.foo2=panel.foo2 from page.properties
+foo2=foo2 from page.properties
+foo3=foo3 from page.properties
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelPage_3.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java?rev=588790&r1=588789&r2=588790&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
Fri Oct 26 16:05:38 2007
@@ -86,6 +86,14 @@
/**
* @throws Exception
*/
+ public void testPanel3() throws Exception
+ {
+ executeTest(PanelPage_3.class,
"PanelPageExpectedResult_3.html");
+ }
+
+ /**
+ * @throws Exception
+ */
public void testInlinePanel() throws Exception
{
executeTest(InlinePanelPage_1.class,
"InlinePanelPageExpectedResult_1.html");
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.html
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.html?rev=588790&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.html
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.html
Fri Oct 26 16:05:38 2007
@@ -0,0 +1,11 @@
+<html>
+<body>
+<wicket:panel>
+<table>
+<tr><td>Foo1</td><td><wicket:message key="foo1"></wicket:message></td></tr>
+<tr><td>Foo2</td><td><wicket:message key="foo2"></wicket:message></td></tr>
+<tr><td>Foo3</td><td><wicket:message key="foo3"></wicket:message></td></tr>
+</table>
+</wicket:panel>
+</body>
+</html>
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.html
------------------------------------------------------------------------------
svn:eol-style = native
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.java?rev=588790&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.java
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.java
Fri Oct 26 16:05:38 2007
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.markup.html.panel;
+
+
+/**
+ * Mock page for testing.
+ *
+ * @author Chris Turner
+ */
+public class SimplePanel_3 extends Panel
+{
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * Construct.
+ *
+ * @param id
+ */
+ public SimplePanel_3(final String id)
+ {
+ super(id);
+ }
+}
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.properties
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.properties?rev=588790&view=auto
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.properties
(added)
+++
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.properties
Fri Oct 26 16:05:38 2007
@@ -0,0 +1 @@
+foo3=Foo3 from panel.properties
Propchange:
wicket/trunk/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/panel/SimplePanel_3.properties
------------------------------------------------------------------------------
svn:eol-style = native
