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 2011/07/13 01:48:49 UTC
svn commit: r1145820 - in /wicket/branches/wicket-1.4.x/wicket/src:
main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
Author: ivaynberg
Date: Tue Jul 12 23:48:48 2011
New Revision: 1145820
URL: http://svn.apache.org/viewvc?rev=1145820&view=rev
Log:
change name of css class from "text" to "label-text" to make it more specific and lessen a chance of a collission
Modified:
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
Modified: wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java?rev=1145820&r1=1145819&r2=1145820&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java Tue Jul 12 23:48:48 2011
@@ -394,7 +394,7 @@ public class AutoLabelResolver implement
boolean textClassFound = false;
for (String className : classNames.split(" "))
{
- if ("text".equals(className))
+ if ("label-text".equals(className))
{
textClassFound = true;
break;
Modified: wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java
URL: http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java?rev=1145820&r1=1145819&r2=1145820&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java (original)
+++ wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/markup/html/form/AutoLabelTest.java Tue Jul 12 23:48:48 2011
@@ -45,23 +45,24 @@ public class AutoLabelTest extends Wicke
}
// simple insertion
- assertRendered(new MyTestPage("<span class='text'>text</span>"),
- "<span class='text'>t</span>");
+ assertRendered(new MyTestPage("<span class='label-text'>text</span>"),
+ "<span class='label-text'>t</span>");
// preserves markup before and after
- assertRendered(new MyTestPage(" <div> a </div> <span class='text'>text</span> b "),
- " <div> a </div> <span class='text'>t</span> b ");
+ assertRendered(new MyTestPage(" <div> a </div> <span class='label-text'>text</span> b "),
+ " <div> a </div> <span class='label-text'>t</span> b ");
// embedded span tags
- assertRendered(new MyTestPage(" a <div> b <span class='text'>text</span> c </div> d"),
- " a <div> b <span class='text'>t</span> c </div> d");
+ assertRendered(
+ new MyTestPage(" a <div> b <span class='label-text'>text</span> c </div> d"),
+ " a <div> b <span class='label-text'>t</span> c </div> d");
// double text span tags - only the first one is touched
assertRendered(new MyTestPage(
- "<span class='text'>text</span><span class='text'>text</span>"),
- "<span class='text'>t</span><span class='text'>text</span>");
+ "<span class='label-text'>text</span><span class='label-text'>text</span>"),
+ "<span class='label-text'>t</span><span class='label-text'>text</span>");
// no span - no insertion
assertRendered(new MyTestPage(" text "), " text ");
@@ -70,14 +71,16 @@ public class AutoLabelTest extends Wicke
assertRendered(new MyTestPage(""), "></label>");
// empty span tag
- assertRendered(new MyTestPage("<span class='text'></span>"), "<span class='text'>t</span>");
+ assertRendered(new MyTestPage("<span class='label-text'></span>"),
+ "<span class='label-text'>t</span>");
// open/close span tag
- assertRendered(new MyTestPage("<span class='text'/>"), "<span class='text'>t</span>");
+ assertRendered(new MyTestPage("<span class='label-text'/>"),
+ "<span class='label-text'>t</span>");
// test additional classes on the span are preserved
- assertRendered(new MyTestPage("<span class='foo text bar'/>"),
- "<span class='foo text bar'>t</span>");
+ assertRendered(new MyTestPage("<span class='foo label-text bar'/>"),
+ "<span class='foo label-text bar'>t</span>");
}
public void testMarkupIntoLabelInsertion()
@@ -90,9 +93,9 @@ public class AutoLabelTest extends Wicke
}
}
- // test form component label is defaulted to the contents of span class='text'
+ // test form component label is defaulted to the contents of span class='label-text'
- MyTestPage page = new MyTestPage("<span class='text'>text</span>");
+ MyTestPage page = new MyTestPage("<span class='label-text'>text</span>");
tester.startPage(page);
assertEquals("text", ((MyTestPage)tester.getLastRenderedPage()).field.getLabel()
.getObject());
@@ -104,7 +107,7 @@ public class AutoLabelTest extends Wicke
{
public MyTestPage()
{
- super("<label wicket:for='t'><span class='text'>field</span></label>");
+ super("<label wicket:for='t'><span class='label-text'>field</span></label>");
}
}
@@ -134,7 +137,8 @@ public class AutoLabelTest extends Wicke
{
public MyTestPage2()
{
- super("<label class='long' wicket:for='t'><span class='text'>field</span></label>");
+ super(
+ "<label class='long' wicket:for='t'><span class='label-text'>field</span></label>");
}
}