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 2010/11/15 17:22:53 UTC
svn commit: r1035342 - in
/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago:
internal/webapp/ webapp/
Author: lofwyr
Date: Mon Nov 15 16:22:52 2010
New Revision: 1035342
URL: http://svn.apache.org/viewvc?rev=1035342&view=rev
Log:
TOBAGO-893:
- Backward compatibility: render also the old styleClass attribute
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java?rev=1035342&r1=1035341&r2=1035342&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/DebugTobagoResponseWriterWrapper.java Mon Nov 15 16:22:52 2010
@@ -83,6 +83,12 @@ public class DebugTobagoResponseWriterWr
responseWriter.writeAttribute(name, value, null);
}
+ @Override
+ @Deprecated
+ protected String getStyleClasses() {
+ return null;
+ }
+
/**
* @deprecated since Tobago 1.5.0
*/
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java?rev=1035342&r1=1035341&r2=1035342&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterBase.java Mon Nov 15 16:22:52 2010
@@ -253,6 +253,19 @@ public abstract class TobagoResponseWrit
writeAttributeInternal(writer, name, value, escape);
}
+ @Override
+ @Deprecated
+ protected String getStyleClasses() {
+ if (component == null) {
+ return null;
+ }
+ StyleClasses clazz = (StyleClasses) component.getAttributes().get(Attributes.STYLE_CLASS);
+ if (clazz != null) {
+ return clazz.toString();
+ }
+ return null;
+ }
+
/**
* @deprecated since Tobago 1.5.0
*/
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java?rev=1035342&r1=1035341&r2=1035342&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/webapp/TobagoResponseWriterWrapper.java Mon Nov 15 16:22:52 2010
@@ -74,6 +74,12 @@ public class TobagoResponseWriterWrapper
responseWriter.writeAttribute(name, value, null);
}
+ @Override
+ @Deprecated
+ protected String getStyleClasses() {
+ return null;
+ }
+
/**
* @deprecated since Tobago 1.5.0
*/
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java?rev=1035342&r1=1035341&r2=1035342&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriter.java Mon Nov 15 16:22:52 2010
@@ -140,12 +140,24 @@ public abstract class TobagoResponseWrit
/**
* Write the class attribute. The value will not escaped.
+ * <br/>
+ * <b>Note:</b> For backward compatibility the value of the Attribute
+ * <code>{@link org.apache.myfaces.tobago.component.Attributes#STYLE_CLASS}</code>
+ * will be inserted additionally. This function will be removed in later releases.
* @param classes The abstract representation of the css class string, normally created by the renderer.
*/
public void writeClassAttribute(Classes classes) throws IOException {
- writeAttribute(HtmlAttributes.CLASS, classes.getStringValue(), false);
+ String styleClasses = getStyleClasses();
+ String stringValue = classes.getStringValue();
+ if (styleClasses != null) {
+ stringValue += " " + styleClasses;
+ }
+ writeAttribute(HtmlAttributes.CLASS, stringValue, false);
}
+ @Deprecated
+ protected abstract String getStyleClasses();
+
/**
* Write the class attribute. The value will not escaped.
* @deprecated since Tobago 1.5.0