You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2007/11/25 22:48:23 UTC
svn commit: r598063 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/renderkit/html/
theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/
theme/scarborough/src/main/java/org/apach...
Author: bommel
Date: Sun Nov 25 13:48:22 2007
New Revision: 598063
URL: http://svn.apache.org/viewvc?rev=598063&view=rev
Log:
(TOBAGO-546) selectOneChoice should support coloring and images
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.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=598063&r1=598062&r2=598063&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 Sun Nov 25 13:48:22 2007
@@ -134,12 +134,8 @@
}
public void addMarkupClass(UIComponent component, String rendererName) {
- addMarkupClass(component, rendererName, null);
- }
-
- public void addMarkupClass(UIComponent component, String rendererName, String sub) {
if (component instanceof SupportsMarkup) {
- addMarkupClass((SupportsMarkup) component, rendererName, sub);
+ addMarkupClass((SupportsMarkup) component, rendererName, null);
}
}
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java?rev=598063&r1=598062&r2=598063&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/mozilla_4_7/tag/ProgressRenderer.java Sun Nov 25 13:48:22 2007
@@ -45,7 +45,7 @@
public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
- UIProgress component = (UIProgress) uiComponent;
+ UIProgress component = (UIProgress) uiComponent;
BoundedRangeModel model = (BoundedRangeModel) component.getValue();
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java?rev=598063&r1=598062&r2=598063&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TabGroupRenderer.java Sun Nov 25 13:48:22 2007
@@ -35,7 +35,6 @@
import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
import org.apache.myfaces.tobago.component.ComponentUtil;
-import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.UIPage;
import org.apache.myfaces.tobago.component.UIPanelBase;
import org.apache.myfaces.tobago.component.UITab;
@@ -273,8 +272,8 @@
outerClass.addClass("tab", "unselected-outer");
innerClass.addClass("tab", "unselected-inner");
}
- outerClass.addMarkupClass((SupportsMarkup) tab, "tab", "outer");
- innerClass.addMarkupClass((SupportsMarkup) tab, "tab", "outer");
+ outerClass.addMarkupClass(tab, "tab", "outer");
+ innerClass.addMarkupClass(tab, "tab", "outer");
writer.startElement(HtmlConstants.TD, tab);
writer.writeIdAttribute(tab.getClientId(facesContext));
HtmlRendererUtil.renderTip(tab, writer);
@@ -353,7 +352,7 @@
writer.startElement(HtmlConstants.TD, null);
StyleClasses classes = new StyleClasses();
classes.addClass("tab", "content");
- classes.addMarkupClass((SupportsMarkup) activeTab, "tab", "content");
+ classes.addMarkupClass(activeTab, "tab", "content");
writer.writeClassAttribute(classes);
writer.writeStyleAttribute(bodyStyle);
writer.flush();
Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=598063&r1=598062&r2=598063&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Sun Nov 25 13:48:22 2007
@@ -33,6 +33,7 @@
import static org.apache.myfaces.tobago.TobagoConstants.FACET_TOOL_BAR;
import org.apache.myfaces.tobago.ajax.api.AjaxRenderer;
import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
+import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.renderkit.BoxRendererBase;
import org.apache.myfaces.tobago.renderkit.RenderUtil;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
@@ -90,13 +91,17 @@
writer.startElement(HtmlConstants.DIV, component);
StyleClasses contentClasses = new StyleClasses();
contentClasses.addClass("box", "content");
- contentClasses.addMarkupClass(component, "box", "content");
+ if (component instanceof SupportsMarkup) {
+ contentClasses.addMarkupClass((SupportsMarkup) component, "box", "content");
+ }
writer.writeClassAttribute(contentClasses);
writer.startElement(HtmlConstants.DIV, component);
StyleClasses contentInnerClasses = new StyleClasses();
contentInnerClasses.addClass("box", "content-inner");
- contentInnerClasses.addMarkupClass(component, "box", "content-inner");
+ if (component instanceof SupportsMarkup) {
+ contentInnerClasses.addMarkupClass((SupportsMarkup) component, "box", "content-inner");
+ }
writer.writeClassAttribute(contentInnerClasses);
writer.writeStyleAttribute(innerStyle);
}
@@ -108,7 +113,9 @@
writer.startElement(HtmlConstants.DIV, component);
StyleClasses headerClasses = new StyleClasses();
headerClasses.addClass("box", "header");
- headerClasses.addMarkupClass(component, "box", "header");
+ if (component instanceof SupportsMarkup) {
+ headerClasses.addMarkupClass((SupportsMarkup) component, "box", "header");
+ }
writer.writeClassAttribute(headerClasses);
UIComponent label = component.getFacet(FACET_LABEL);
writer.startElement(HtmlConstants.SPAN, null);
Modified: myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java?rev=598063&r1=598062&r2=598063&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/theme/speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/TabGroupRenderer.java Sun Nov 25 13:48:22 2007
@@ -25,7 +25,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_BODY;
-import org.apache.myfaces.tobago.component.SupportsMarkup;
import org.apache.myfaces.tobago.component.UITab;
import org.apache.myfaces.tobago.renderkit.RenderUtil;
import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
@@ -63,7 +62,7 @@
writer.startElement(HtmlConstants.DIV, null);
StyleClasses classes = new StyleClasses();
classes.addClass("tab", "content");
- classes.addMarkupClass((SupportsMarkup) activeTab, "tab", "content");
+ classes.addMarkupClass(activeTab, "tab", "content");
writer.writeClassAttribute(classes);
Integer height = HtmlRendererUtil.getStyleAttributeIntValue(bodyStyle, "height");