You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2007/09/26 10:04:52 UTC
svn commit: r579497 -
/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
Author: weber
Date: Wed Sep 26 01:04:52 2007
New Revision: 579497
URL: http://svn.apache.org/viewvc?rev=579497&view=rev
Log:
<http://issues.apache.org/jira/browse/TOBAGO-500> markup="none" should not logged as error
and some code cleanup
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.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?rev=579497&r1=579496&r2=579497&view=diff
==============================================================================
--- 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 Wed Sep 26 01:04:52 2007
@@ -20,6 +20,7 @@
import org.apache.commons.collections.set.ListOrderedSet;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.commons.lang.StringUtils;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INLINE;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_READONLY;
@@ -104,20 +105,11 @@
}
public void addMarkupClass(String renderer, String markup) {
- classes.add(nameOfMarkupClass(renderer, markup));
+ addMarkupClass(renderer, null, 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);
- return builder.toString();
+ removeMarkupClass(renderer, null, markup);
}
public void addMarkupClass(String renderer, String sub, String markup) {
@@ -132,36 +124,30 @@
StringBuilder builder = new StringBuilder();
builder.append(PREFIX);
builder.append(renderer);
- builder.append(SEPERATOR);
- builder.append(sub);
+ if (sub != null) {
+ builder.append(SEPERATOR);
+ builder.append(sub);
+ }
builder.append(MARKUP);
builder.append(markup);
return builder.toString();
}
public void addMarkupClass(UIComponent component, String rendererName) {
- if (component instanceof SupportsMarkup) {
- String[] markups = ((SupportsMarkup) component).getMarkup();
- for (String markup: markups) {
- Theme theme = ClientProperties.getInstance(FacesContext.getCurrentInstance().getViewRoot()).getTheme();
- if (theme.getRenderersConfig().isMarkupSupported(rendererName, markup)) {
- addMarkupClass(rendererName, markup);
- } else {
- LOG.warn("Unknown markup='" + markup + "'");
- }
- }
- }
+ addMarkupClass(component, rendererName, null);
}
public void addMarkupClass(UIComponent component, String rendererName, String sub) {
if (component instanceof SupportsMarkup) {
String[] markups = ((SupportsMarkup) component).getMarkup();
for (String markup: markups) {
- Theme theme = ClientProperties.getInstance(FacesContext.getCurrentInstance().getViewRoot()).getTheme();
- if (theme.getRenderersConfig().isMarkupSupported(rendererName, markup)) {
- addMarkupClass(rendererName, sub, markup);
- } else {
- LOG.warn("Unknown markup='" + markup + "'");
+ if (!StringUtils.isBlank(markup)) {
+ Theme theme = ClientProperties.getInstance(FacesContext.getCurrentInstance().getViewRoot()).getTheme();
+ if (theme.getRenderersConfig().isMarkupSupported(rendererName, markup)) {
+ addMarkupClass(rendererName, sub, markup);
+ } else if (!"none".equals(markup)) {
+ LOG.warn("Unknown markup='" + markup + "'");
+ }
}
}
}