You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/09/16 07:54:10 UTC
svn commit: r695734 - in /wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src:
main/java/org/apache/wicket/markup/html/border/
test/java/org/apache/wicket/markup/html/border/
Author: ivaynberg
Date: Mon Sep 15 22:54:09 2008
New Revision: 695734
URL: http://svn.apache.org/viewvc?rev=695734&view=rev
Log:
WICKET-1829
Added:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html (with props)
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java (with props)
Modified:
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.html
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage_ExpectedResult.html
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java?rev=695734&r1=695733&r2=695734&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/border/MarkupComponentBorder.java Mon Sep 15 22:54:09 2008
@@ -71,7 +71,8 @@
boolean insideBorderMarkup = false;
while (stream.hasMore())
{
- MarkupElement e = stream.next();
+ MarkupElement e = stream.get();
+ stream.next();
if (e instanceof WicketTag)
{
WicketTag wt = (WicketTag)e;
@@ -85,9 +86,9 @@
else
{
throw new WicketRuntimeException(
- "Unexpected tag encountered in markup of component border " +
- getClass().getName() + ". Tag: " + wt.toString() +
- ", expected tag: <wicket:border>");
+ "Unexpected tag encountered in markup of component border " +
+ getClass().getName() + ". Tag: " + wt.toString() +
+ ", expected tag: <wicket:border>");
}
}
else
@@ -99,9 +100,9 @@
else
{
throw new WicketRuntimeException(
- "Unexpected tag encountered in markup of component border " +
- getClass().getName() + ". Tag: " + wt.toString() +
- ", expected tag: <wicket:body> or </wicket:body>");
+ "Unexpected tag encountered in markup of component border " +
+ getClass().getName() + ". Tag: " + wt.toString() +
+ ", expected tag: <wicket:body> or </wicket:body>");
}
}
}
@@ -114,7 +115,7 @@
if (!stream.hasMore())
{
throw new WicketRuntimeException("Markup for component border " + getClass().getName() +
- " ended prematurely, was expecting </wicket:border>");
+ " ended prematurely, was expecting </wicket:border>");
}
}
@@ -129,7 +130,8 @@
while (stream.hasMore())
{
- MarkupElement e = stream.next();
+ MarkupElement e = stream.get();
+ stream.next();
if (e instanceof WicketTag)
{
WicketTag wt = (WicketTag)e;
@@ -140,9 +142,9 @@
else
{
throw new WicketRuntimeException(
- "Unexpected tag encountered in markup of component border " +
- getClass().getName() + ". Tag: " + wt.toString() +
- ", expected tag: </wicket:border>");
+ "Unexpected tag encountered in markup of component border " +
+ getClass().getName() + ". Tag: " + wt.toString() +
+ ", expected tag: </wicket:border>");
}
}
response.write(e.toCharSequence());
@@ -167,8 +169,9 @@
// logic here
// Get locator to search for the resource
- final IResourceStreamLocator locator = Application.get().getResourceSettings()
- .getResourceStreamLocator();
+ final IResourceStreamLocator locator = Application.get()
+ .getResourceSettings()
+ .getResourceStreamLocator();
final Session session = Session.get();
@@ -182,13 +185,13 @@
{
String path = containerClass.getName().replace('.', '/');
IResourceStream resourceStream = locator.locate(containerClass, path, style, locale,
- markupType);
+ markupType);
// Did we find it already?
if (resourceStream != null)
{
ContainerInfo ci = new ContainerInfo(containerClass, locale, style, null,
- markupType);
+ markupType);
markupResourceStream = new MarkupResourceStream(resourceStream, ci, containerClass);
break;
}
@@ -201,20 +204,23 @@
if (markupResourceStream == null)
{
throw new WicketRuntimeException("Could not find markup for component border `" +
- getClass().getName() + "`");
+ getClass().getName() + "`");
}
try
{
- Markup markup = Application.get().getMarkupSettings().getMarkupParserFactory()
- .newMarkupParser(markupResourceStream).parse();
+ Markup markup = Application.get()
+ .getMarkupSettings()
+ .getMarkupParserFactory()
+ .newMarkupParser(markupResourceStream)
+ .parse();
return new MarkupStream(markup);
}
catch (Exception e)
{
throw new WicketRuntimeException(
- "Could not parse markup from markup resource stream: " +
- markupResourceStream.toString());
+ "Could not parse markup from markup resource stream: " +
+ markupResourceStream.toString());
}
}
Added: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html?rev=695734&view=auto
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html (added)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html Mon Sep 15 22:54:09 2008
@@ -0,0 +1 @@
+<wicket:border>[[<wicket:body/>]]</wicket:border>
\ No newline at end of file
Propchange: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.html
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java?rev=695734&view=auto
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java (added)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java Mon Sep 15 22:54:09 2008
@@ -0,0 +1,30 @@
+/*
+ * 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.border;
+
+
+/**
+ * @author jcompagner
+ *
+ */
+public class BeforeAndAfterBorder2 extends MarkupComponentBorder
+{
+ private static final long serialVersionUID = 1L;
+}
Propchange: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/BeforeAndAfterBorder2.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.html?rev=695734&r1=695733&r2=695734&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.html (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.html Mon Sep 15 22:54:09 2008
@@ -1,5 +1,6 @@
<html>
<body>
<span wicket:id="label"></span>
+<span wicket:id="label2"></span>
</body>
</html>
\ No newline at end of file
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java?rev=695734&r1=695733&r2=695734&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage.java Mon Sep 15 22:54:09 2008
@@ -18,7 +18,6 @@
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.model.Model;
/**
@@ -37,6 +36,7 @@
*/
public MarkupComponentBorderTestPage()
{
- add(new Label("label", new Model("label")).setComponentBorder(new BeforeAndAfterBorder()));
+ add(new Label("label", "label").setComponentBorder(new BeforeAndAfterBorder()));
+ add(new Label("label2", "label2").setComponentBorder(new BeforeAndAfterBorder2()));
}
}
Modified: wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage_ExpectedResult.html
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage_ExpectedResult.html?rev=695734&r1=695733&r2=695734&view=diff
==============================================================================
--- wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage_ExpectedResult.html (original)
+++ wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/markup/html/border/MarkupComponentBorderTestPage_ExpectedResult.html Mon Sep 15 22:54:09 2008
@@ -1,5 +1,6 @@
<html>
<body>
[[<span wicket:id="label">label</span>]]
+[[<span wicket:id="label2">label2</span>]]
</body>
</html>
\ No newline at end of file