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/08/03 10:40:05 UTC
svn commit: r562385 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/component/
core/src/main/java/org/apache/myfaces/tobago/renderkit/html/
sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag...
Author: bommel
Date: Fri Aug 3 01:39:59 2007
New Revision: 562385
URL: http://svn.apache.org/viewvc?view=rev&rev=562385
Log:
(TOBAGO-460) Markup attribute for label
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UILabel.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UILabel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UILabel.java?view=diff&rev=562385&r1=562384&r2=562385
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UILabel.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UILabel.java Fri Aug 3 01:39:59 2007
@@ -26,11 +26,37 @@
import javax.faces.context.FacesContext;
import java.io.IOException;
-public class UILabel extends UIOutput {
+public class UILabel extends UIOutput implements SupportsMarkup {
private static final Log LOG = LogFactory.getLog(UILabel.class);
public static final String COMPONENT_TYPE = "org.apache.myfaces.tobago.Label";
+
+ private String[] markup;
+
+ public void restoreState(FacesContext context, Object state) {
+ Object[] values = (Object[]) state;
+ super.restoreState(context, values[0]);
+ markup = (String[]) values[1];
+ }
+
+ public Object saveState(FacesContext context) {
+ Object[] values = new Object[2];
+ values[0] = super.saveState(context);
+ values[1] = markup;
+ return values;
+ }
+
+ public String[] getMarkup() {
+ if (markup != null) {
+ return markup;
+ }
+ return ComponentUtil.getMarkupBinding(getFacesContext(), this);
+ }
+
+ public void setMarkup(String[] markup) {
+ this.markup = markup;
+ }
@Override
public void encodeBegin(FacesContext facesContext) throws IOException {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java?view=diff&rev=562385&r1=562384&r2=562385
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/html/HtmlRendererUtil.java Fri Aug 3 01:39:59 2007
@@ -115,7 +115,7 @@
String rendererName = getRendererName(facesContext, component);
if (rendererName != null) {
StyleClasses classes = StyleClasses.ensureStyleClasses(component);
- classes.updateClassAttribute(component, rendererName);
+ classes.updateClassAttributeAndMarkup(component, rendererName);
}
}
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=562385&r1=562384&r2=562385
==============================================================================
--- 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 Fri Aug 3 01:39:59 2007
@@ -221,6 +221,11 @@
}
}
+ public void updateClassAttributeAndMarkup(UIComponent component, String rendererName) {
+ updateClassAttribute(component, rendererName);
+ addMarkupClass(component, rendererName);
+ }
+
public void updateClassAttribute(UIComponent component, String rendererName) {
// first remove old tobago-<rendererName>-<type> classes from class-attribute
removeTobagoClasses(rendererName);
@@ -244,8 +249,6 @@
addAspectClass(rendererName, Aspect.REQUIRED);
}
}
-
- addMarkupClass(component, rendererName);
}
@Override
Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java?view=diff&rev=562385&r1=562384&r2=562385
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/TreeNodeRenderer.java Fri Aug 3 01:39:59 2007
@@ -152,7 +152,7 @@
// div class (css)
StyleClasses styleClasses = StyleClasses.ensureStyleClasses(node);
- styleClasses.updateClassAttribute(node, "treeNode");
+ styleClasses.updateClassAttributeAndMarkup(node, "treeNode");
if ("menu".equals(root.getMode())) {
styleClasses.addClass("treeNode", "menu");
if (marked) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java?view=diff&rev=562385&r1=562384&r2=562385
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/LabelRenderer.java Fri Aug 3 01:39:59 2007
@@ -54,7 +54,10 @@
String name = getRendererName(rendererType);
UIComponent parent = findParent(component);
- StyleClasses.ensureStyleClasses(component).updateClassAttribute(parent, name);
+ StyleClasses styleClasses = StyleClasses.ensureStyleClasses(component);
+ styleClasses.updateClassAttribute(parent, name);
+ styleClasses.addMarkupClass(component, name);
+
}
private UIComponent findParent(UIComponent component) {
@@ -102,9 +105,9 @@
writer.writeAttribute(HtmlAttributes.FOR, forValue, false);
}
writer.writeClassAttribute();
- if (width != null) {
- writer.writeAttribute(HtmlAttributes.STYLE, "width: " + width + "px;", false);
- }
+ //if (width != null) {
+ // writer.writeAttribute(HtmlAttributes.STYLE, "width: " + width + "px;", false);
+ //}
writer.writeAttributeFromComponent(HtmlAttributes.TITLE, ATTR_TIP);
if (label.getText() != null) {
Modified: myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?view=diff&rev=562385&r1=562384&r2=562385
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Fri Aug 3 01:39:59 2007
@@ -436,6 +436,16 @@
/* label ------------------------------------------------------------------- */
+div.tobago-label-markup-number {
+ text-align: right;
+}
+
+a.tobago-label-markup-number {
+ padding-left: 0px;
+ padding-right: 8px;
+
+}
+
div.tobago-label-default {
}
Modified: myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml?view=diff&rev=562385&r1=562384&r2=562385
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/resources/META-INF/tobago-theme.xml Fri Aug 3 01:39:59 2007
@@ -38,6 +38,12 @@
</supported-markup>
</renderer>
<renderer>
+ <name>Label</name>
+ <supported-markup>
+ <markup>number</markup>
+ </supported-markup>
+ </renderer>
+ <renderer>
<name>TreeNode</name>
<supported-markup>
<markup>strong</markup>