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 2015/09/11 17:41:44 UTC
svn commit: r1702503 - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/layout/
tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/
tobago-theme/t...
Author: lofwyr
Date: Fri Sep 11 15:41:43 2015
New Revision: 1702503
URL: http://svn.apache.org/r1702503
Log:
TOBAGO-1489: Optimize enums used for attributes in taglib.
* Display
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Display.java
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeMenuNodeRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Display.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Display.java?rev=1702503&r1=1702502&r2=1702503&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Display.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/layout/Display.java Fri Sep 11 15:41:43 2015
@@ -19,19 +19,51 @@
package org.apache.myfaces.tobago.layout;
+/**
+ * Values for display attribute used with CSS.
+ *
+ * Note: the enums are not capitalized, because of problems with {@link java.beans.PropertyEditor}.
+ */
public enum Display {
- BLOCK("block"),
- INLINE("inline"),
- NONE("none");
-
- private String value;
-
- Display(final String value) {
- this.value = value;
- }
-
+ block,
+ inline,
+ none;
+
+ /**
+ * @deprecated Since Tobago 3.0.0 Please use {@link Display#block}
+ */
+ public static final Display BLOCK = block;
+
+ /**
+ * @deprecated Since Tobago 3.0.0 Please use {@link Display#inline}
+ */
+ public static final Display INLINE = inline;
+
+ /**
+ * @deprecated Since Tobago 3.0.0 Please use {@link Display#none}
+ */
+ public static final Display NONE = none;
+
+ /**
+ * Internal constant to use in annotations. Please use {@link Display#block}
+ */
+ public static final String STRING_BLOCK = "block";
+
+ /**
+ * Internal constant to use in annotations. Please use {@link Display#inline}
+ */
+ public static final String STRING_INLINE = "inline";
+
+ /**
+ * Internal constant to use in annotations. Please use {@link Display#none}
+ */
+ public static final String STRING_NONE = "none";
+
+ /**
+ * @deprecated Since Tobago 3.0.0 Please use {@link Display:name}
+ */
public String getValue() {
- return value;
+ return name();
}
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java?rev=1702503&r1=1702502&r2=1702503&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SplitLayoutRenderer.java Fri Sep 11 15:41:43 2015
@@ -150,7 +150,7 @@ public class SplitLayoutRenderer extends
style.setTop(Measure.valueOf(Measure.valueOf(secondComponent.getTop().subtract(5))));
}
// todo: use CSS class
- style.setDisplay(Display.BLOCK);
+ style.setDisplay(Display.block);
style.setPosition(Position.absolute);
return style;
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java?rev=1702503&r1=1702502&r2=1702503&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/HiddenRenderer.java Fri Sep 11 15:41:43 2015
@@ -47,7 +47,7 @@ public class HiddenRenderer extends Inpu
if (component instanceof UIHidden && ((UIHidden) component).isDisabled()) {
writer.writeAttribute(HtmlAttributes.TYPE, HtmlInputTypes.TEXT, false);
final Style style = new Style();
- style.setDisplay(Display.NONE);
+ style.setDisplay(Display.none);
writer.writeStyleAttribute(style);
writer.writeAttribute(HtmlAttributes.DISABLED, true);
} else {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java?rev=1702503&r1=1702502&r2=1702503&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java Fri Sep 11 15:41:43 2015
@@ -298,7 +298,7 @@ public class SheetRenderer extends Layou
writer.writeClassAttribute(Classes.create(sheet, "row", rowMarkup));
if (!sheet.isRowVisible()) {
final Style rowStyle = new Style();
- rowStyle.setDisplay(Display.NONE);
+ rowStyle.setDisplay(Display.none);
writer.writeStyleAttribute(rowStyle);
}
final String parentId = sheet.getRowParentClientId();
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeMenuNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeMenuNodeRenderer.java?rev=1702503&r1=1702502&r2=1702503&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeMenuNodeRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeMenuNodeRenderer.java Fri Sep 11 15:41:43 2015
@@ -67,7 +67,7 @@ public class TreeMenuNodeRenderer extend
// In the case of a sheet, we need not hiding the node, because the whole TR will be hidden.
if (!dataRendersRowContainer && !visible) {
final Style style = new Style();
- style.setDisplay(Display.NONE);
+ style.setDisplay(Display.none);
writer.writeStyleAttribute(style);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java?rev=1702503&r1=1702502&r2=1702503&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeNodeRenderer.java Fri Sep 11 15:41:43 2015
@@ -63,7 +63,7 @@ public class TreeNodeRenderer extends Tr
final Style style = new Style();
// In the case of a sheet, we need not hiding the node, because the whole TR will be hidden.
if (!dataRendersRowContainer && !visible) {
- style.setDisplay(Display.NONE);
+ style.setDisplay(Display.none);
}
// div style (width)