You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2007/07/10 09:55:52 UTC
svn commit: r554864 - in /myfaces/tobago/trunk/core/src:
main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
test/java/org/apache/myfaces/tobago/renderkit/html/StyleClassesUnitTest.java
Author: lofwyr
Date: Tue Jul 10 00:55:51 2007
New Revision: 554864
URL: http://svn.apache.org/viewvc?view=rev&rev=554864
Log:
Add some "remove" methods.
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/html/StyleClassesUnitTest.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java?view=diff&rev=554864&r1=554863&r2=554864
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java Tue Jul 10 00:55:51 2007
@@ -49,8 +49,8 @@
public static final char SEPERATOR = '-';
public static final String PREFIX = "tobago" + SEPERATOR;
-
public static final String MARKUP = SEPERATOR + "markup" + SEPERATOR;
+
private ListOrderedSet classes;
public StyleClasses() {
@@ -81,25 +81,54 @@
classes.add(clazz);
}
+ @Deprecated
+ public void removeFullQualifiedClass(String clazz) {
+ classes.remove(clazz);
+ }
+
public void addClass(String renderer, String sub) {
+ classes.add(nameOfClass(renderer, sub));
+ }
+
+ public void removeClass(String renderer, String sub) {
+ classes.remove(nameOfClass(renderer, sub));
+ }
+
+ private String nameOfClass(String renderer, String sub) {
StringBuilder builder = new StringBuilder();
builder.append(PREFIX);
builder.append(renderer);
builder.append(SEPERATOR);
builder.append(sub);
- classes.add(builder.toString());
+ return builder.toString();
}
public void addMarkupClass(String renderer, String markup) {
+ classes.add(nameOfMarkupClass(renderer, markup));
+ }
+
+ public void removeMarkupClass(String renderer, String markup) {
+ classes.remove(nameOfMarkupClass(renderer, markup));
+ }
+
+ private String nameOfMarkupClass(String renderer, String markup) {
StringBuilder builder = new StringBuilder();
builder.append(PREFIX);
builder.append(renderer);
builder.append(MARKUP);
builder.append(markup);
- classes.add(builder.toString());
+ return builder.toString();
}
public void addMarkupClass(String renderer, String sub, String markup) {
+ classes.add(nameOfMarkupClass(renderer, sub, markup));
+ }
+
+ public void removeMarkupClass(String renderer, String sub, String markup) {
+ classes.remove(nameOfMarkupClass(renderer, sub, markup));
+ }
+
+ private String nameOfMarkupClass(String renderer, String sub, String markup) {
StringBuilder builder = new StringBuilder();
builder.append(PREFIX);
builder.append(renderer);
@@ -107,7 +136,7 @@
builder.append(sub);
builder.append(MARKUP);
builder.append(markup);
- classes.add(builder.toString());
+ return builder.toString();
}
public void addMarkupClass(UIComponent component, String rendererName) {
@@ -139,29 +168,38 @@
}
public void addAspectClass(String renderer, Aspect aspect) {
- StringBuilder builder = new StringBuilder();
- builder.append(PREFIX);
- builder.append(renderer);
- builder.append(aspect);
- classes.add(builder.toString());
+ classes.add(nameOfAspectClass(renderer, aspect));
}
public void removeAspectClass(String renderer, Aspect aspect) {
+ classes.remove(nameOfAspectClass(renderer, aspect));
+ }
+
+ private String nameOfAspectClass(String renderer, Aspect aspect) {
StringBuilder builder = new StringBuilder();
builder.append(PREFIX);
builder.append(renderer);
builder.append(aspect);
- classes.remove(builder.toString());
+ return builder.toString();
}
+
public void addAspectClass(String renderer, String sub, Aspect aspect) {
+ classes.add(nameOfAspectClass(renderer, sub, aspect));
+ }
+
+ public void removeAspectClass(String renderer, String sub, Aspect aspect) {
+ classes.remove(nameOfAspectClass(renderer, sub, aspect));
+ }
+
+ private String nameOfAspectClass(String renderer, String sub, Aspect aspect) {
StringBuilder builder = new StringBuilder();
builder.append(PREFIX);
builder.append(renderer);
builder.append(SEPERATOR);
builder.append(sub);
builder.append(aspect);
- classes.add(builder.toString());
+ return builder.toString();
}
public void addClasses(StyleClasses styleClasses) {
Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/html/StyleClassesUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/html/StyleClassesUnitTest.java?view=diff&rev=554864&r1=554863&r2=554864
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/html/StyleClassesUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/renderkit/html/StyleClassesUnitTest.java Tue Jul 10 00:55:51 2007
@@ -53,24 +53,32 @@
StyleClasses c = new StyleClasses();
c.addMarkupClass("myComponent", "big");
assertEquals("tobago-myComponent-markup-big", c.toString());
+ c.removeMarkupClass("myComponent", "big");
+ assertEquals("", c.toString());
}
public void testAddMarkupClassSub() {
StyleClasses c = new StyleClasses();
c.addMarkupClass("myComponent", "mySub", "big");
assertEquals("tobago-myComponent-mySub-markup-big", c.toString());
+ c.removeMarkupClass("myComponent", "mySub", "big");
+ assertEquals("", c.toString());
}
public void testAddAspectClass() {
StyleClasses c = new StyleClasses();
c.addAspectClass("myComponent", StyleClasses.Aspect.DISABLED);
assertEquals("tobago-myComponent-disabled", c.toString());
+ c.removeAspectClass("myComponent", StyleClasses.Aspect.DISABLED);
+ assertEquals("", c.toString());
}
public void testAddAspectClassSub() {
StyleClasses c = new StyleClasses();
c.addAspectClass("myComponent", "mySub", StyleClasses.Aspect.DISABLED);
assertEquals("tobago-myComponent-mySub-disabled", c.toString());
+ c.removeAspectClass("myComponent", "mySub", StyleClasses.Aspect.DISABLED);
+ assertEquals("", c.toString());
}
}