myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lof...@apache.org
Subject svn commit: r707725 [2/5] - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/ core/src/main/java/org/apache/myfaces/tobago/ajax/api/ core/src/main/java/org/apache/myfaces/tobago/component/ core/src/main/java/org/apache/myfaces/tob...
Date Fri, 24 Oct 2008 19:16:41 GMT
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/Sorter.java Fri Oct 24 12:16:37 2008
@@ -20,23 +20,21 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.TobagoConstants;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SORTABLE;
+import org.apache.myfaces.tobago.compat.FacesUtils;
 import org.apache.myfaces.tobago.event.SortActionEvent;
 import org.apache.myfaces.tobago.model.SheetState;
 import org.apache.myfaces.tobago.util.BeanComparator;
-import org.apache.myfaces.tobago.compat.FacesUtils;
 
 import javax.faces.component.UIColumn;
+import javax.faces.component.UICommand;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
 import javax.faces.component.UIOutput;
 import javax.faces.component.UISelectBoolean;
-import javax.faces.component.UICommand;
-import javax.faces.component.UISelectOne;
 import javax.faces.component.UISelectMany;
+import javax.faces.component.UISelectOne;
 import javax.faces.context.FacesContext;
 import javax.faces.model.DataModel;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -181,7 +179,7 @@
 
   private void unsetSortableAttribute(UIColumn uiColumn) {
     LOG.warn("removing attribute sortable from column " + uiColumn.getId());
-    uiColumn.getAttributes().put(ATTR_SORTABLE, Boolean.FALSE);
+    uiColumn.getAttributes().put(Attributes.SORTABLE, Boolean.FALSE);
   }
 
   private UIComponent getFirstSortableChild(List children) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDatePicker.java Fri Oct 24 12:16:37 2008
@@ -18,7 +18,6 @@
  */
 
 import org.apache.myfaces.tobago.OnComponentCreated;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_CALENDAR_DATE_INPUT_ID;
 import org.apache.myfaces.tobago.renderkit.RendererBase;
 
 import javax.faces.component.UIComponent;
@@ -85,10 +84,10 @@
     String clientId = getForComponent().getClientId(facesContext);
     UIComponent box = popup.findComponent("box");
     UIComponent calendar = box.findComponent("calendar");
-    calendar.getAttributes().put(ATTR_CALENDAR_DATE_INPUT_ID, clientId);
+    calendar.getAttributes().put(Attributes.DATE_INPUT_ID, clientId);
     UIComponent time = box.findComponent("time");
     if (time != null) {
-      time.getAttributes().put(ATTR_CALENDAR_DATE_INPUT_ID, clientId);
+      time.getAttributes().put(Attributes.DATE_INPUT_ID, clientId);
     }
     super.broadcast(facesEvent);
   }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDefaultLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDefaultLayout.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDefaultLayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIDefaultLayout.java Fri Oct 24 12:16:37 2008
@@ -19,10 +19,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_HEIGHT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_WIDTH;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_HEIGHT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_WIDTH;
 import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_DEFAULT_LAYOUT;
 
 import javax.faces.component.UIComponent;
@@ -51,10 +47,10 @@
     super.layoutBegin(facesContext, component);
     //TODO why is this needed? 
     for (Object child : component.getChildren()) {
-      ((UIComponent) child).getAttributes().remove(ATTR_INNER_WIDTH);
-      ((UIComponent) child).getAttributes().remove(ATTR_INNER_HEIGHT);
-      ((UIComponent) child).getAttributes().remove(ATTR_LAYOUT_WIDTH);
-      ((UIComponent) child).getAttributes().remove(ATTR_LAYOUT_HEIGHT);
+      ((UIComponent) child).getAttributes().remove(Attributes.INNER_WIDTH);
+      ((UIComponent) child).getAttributes().remove(Attributes.INNER_HEIGHT);
+      ((UIComponent) child).getAttributes().remove(Attributes.LAYOUT_WIDTH);
+      ((UIComponent) child).getAttributes().remove(Attributes.LAYOUT_HEIGHT);
     }
   }
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UILayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UILayout.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UILayout.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UILayout.java Fri Oct 24 12:16:37 2008
@@ -19,8 +19,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_HEIGHT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_WIDTH;
 import org.apache.myfaces.tobago.renderkit.LayoutRenderer;
 import org.apache.myfaces.tobago.util.LayoutUtil;
 
@@ -49,7 +47,7 @@
     if (layoutWidth != null) {
       int space = layoutWidth.intValue();
       int innerSpace = LayoutUtil.getInnerSpace(facesContext, component, space, true);
-      component.getAttributes().put(ATTR_INNER_WIDTH, Integer.valueOf(innerSpace));
+      component.getAttributes().put(Attributes.INNER_WIDTH, Integer.valueOf(innerSpace));
     }
   }
 
@@ -58,7 +56,7 @@
     if (layoutHeight != null) {
       int space = layoutHeight.intValue();
       int innerSpace = LayoutUtil.getInnerSpace(facesContext, component, space, false);
-      component.getAttributes().put(ATTR_INNER_HEIGHT, Integer.valueOf(innerSpace));
+      component.getAttributes().put(Attributes.INNER_HEIGHT, Integer.valueOf(innerSpace));
     }
   }
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UIPanelBase.java Fri Oct 24 12:16:37 2008
@@ -17,8 +17,6 @@
  * limitations under the License.
  */
 
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_IMMEDIATE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_UPDATE;
 import org.apache.myfaces.tobago.ajax.api.AjaxComponent;
 import org.apache.myfaces.tobago.ajax.api.AjaxUtils;
 import org.apache.myfaces.tobago.compat.FacesUtils;
@@ -54,9 +52,9 @@
       UIComponent reload = getFacet(Facets.RELOAD);
       if (ajaxId != null && ajaxId.equals(getClientId(context)) && reload != null && reload.isRendered()
           && ajaxId.equals(ComponentUtil.findPage(context, this).getActionId())) {
-        Boolean immediate = (Boolean) reload.getAttributes().get(ATTR_IMMEDIATE);
+        Boolean immediate = (Boolean) reload.getAttributes().get(Attributes.IMMEDIATE);
         if (immediate != null && immediate) {
-          Boolean update = (Boolean) reload.getAttributes().get(ATTR_UPDATE);
+          Boolean update = (Boolean) reload.getAttributes().get(Attributes.UPDATE);
           if (update != null && !update) {
             if (context.getExternalContext().getResponse() instanceof HttpServletResponse) {
               ((HttpServletResponse) context.getExternalContext().getResponse())
@@ -74,9 +72,9 @@
   public void encodeAjax(FacesContext facesContext) throws IOException {
     UIComponent reload = getFacet(Facets.RELOAD);
     if (reload != null && reload.isRendered()) {
-      Boolean immediate = (Boolean) reload.getAttributes().get(ATTR_IMMEDIATE);
+      Boolean immediate = (Boolean) reload.getAttributes().get(Attributes.IMMEDIATE);
       if (immediate != null && !immediate) {
-        Boolean update = (Boolean) reload.getAttributes().get(ATTR_UPDATE);
+        Boolean update = (Boolean) reload.getAttributes().get(Attributes.UPDATE);
         if (update != null && !update) {
           return;
         }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListbox.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListbox.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListbox.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeListbox.java Fri Oct 24 12:16:37 2008
@@ -19,8 +19,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_COLUMNS;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_SELECTABLE;
 import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_GRID_LAYOUT;
 import org.apache.myfaces.tobago.config.ThemeConfig;
 
@@ -76,16 +74,16 @@
   @SuppressWarnings("unchecked")
   private void fixSelectionType() {
     final Map attributes = getAttributes();
-    Object selectable = attributes.get(ATTR_SELECTABLE);
+    Object selectable = attributes.get(Attributes.SELECTABLE);
     if ("single".equals(selectable)
         || "singleLeafOnly".equals(selectable)
         || "siblingLeafOnly".equals(selectable)) {
     } else if (selectable == null) {
-      attributes.put(ATTR_SELECTABLE, "single");
+      attributes.put(Attributes.SELECTABLE, "single");
     } else {
       // fix to single
       LOG.warn("Illegal attributeValue selectable : " + selectable + " set to 'single'");
-      attributes.put(ATTR_SELECTABLE, "single");
+      attributes.put(Attributes.SELECTABLE, "single");
     }
   }
 
@@ -280,7 +278,7 @@
         columns.append(";1*");
       }
 
-      layout.getAttributes().put(ATTR_COLUMNS, columns.toString());
+      layout.getAttributes().put(Attributes.COLUMNS, columns.toString());
       getFacets().put(Facets.LAYOUT_DEFAULT, layout);
     }
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java Fri Oct 24 12:16:37 2008
@@ -20,7 +20,6 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.TobagoConstants;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TAB_INDEX;
 import org.apache.myfaces.tobago.context.ResourceManagerUtil;
 import org.apache.myfaces.tobago.model.TreeState;
 import org.apache.myfaces.tobago.util.ComponentUtil;
@@ -144,7 +143,7 @@
     if (mode != null) {
       return mode;
     }
-    ValueBinding vb = getValueBinding(TobagoConstants.ATTR_MODE);
+    ValueBinding vb = getValueBinding(Attributes.MODE);
     if (vb != null) {
       return (String) vb.getValue(getFacesContext());
     } else {
@@ -179,7 +178,7 @@
   public void encodeBegin(FacesContext facesContext)
       throws IOException {
     recreateTreeNodes();
-    if (ComponentUtil.getBooleanAttribute(this, TobagoConstants.ATTR_MUTABLE)
+    if (ComponentUtil.getBooleanAttribute(this, Attributes.MUTABLE)
         && getFacet("mutableToolbar") == null
         && getFacet("defaultToolbar") == null) {
       createDefaultToolbar(facesContext);
@@ -194,8 +193,8 @@
     UIComponent component  = facesContext.getApplication().createComponent(UIPanel.COMPONENT_TYPE);
     component.setRendererType(TobagoConstants.RENDERER_TYPE_TOOL_BAR);
     UIComponent toolbar = component;
-    toolbar.getAttributes().put(TobagoConstants.ATTR_ICON_SIZE, AbstractUIToolBar.ICON_SMALL);
-    toolbar.getAttributes().put(TobagoConstants.ATTR_LABEL_POSITION, AbstractUIToolBar.LABEL_OFF);
+    toolbar.getAttributes().put(Attributes.ICON_SIZE, AbstractUIToolBar.ICON_SMALL);
+    toolbar.getAttributes().put(Attributes.LABEL_POSITION, AbstractUIToolBar.LABEL_OFF);
     ActionListener[] handlers = getActionListeners();
 
     if ((handlers == null || handlers.length == 0) && getActionListener() == null) {
@@ -214,10 +213,10 @@
       }
       command.setActionListener(getActionListener());
       command.getAttributes().put(
-          TobagoConstants.ATTR_IMAGE, "image/tobago.tree." + commands[i].getCommand() + ".gif");
+          Attributes.IMAGE, "image/tobago.tree." + commands[i].getCommand() + ".gif");
       String title = ResourceManagerUtil.getPropertyNotNull(facesContext, "tobago",
           "tree" + StringUtil.firstToUpperCase(commands[i].getCommand()));
-      command.getAttributes().put(TobagoConstants.ATTR_TIP, title);
+      command.getAttributes().put(Attributes.TIP, title);
 
     }
 
@@ -291,7 +290,7 @@
 
   public boolean isSelectableTree() {
     final Object selectable
-        = ComponentUtil.getAttribute(this, TobagoConstants.ATTR_SELECTABLE);
+        = ComponentUtil.getAttribute(this, Attributes.SELECTABLE);
     return selectable != null
         && (selectable.equals("multi") || selectable.equals("multiLeafOnly")
         || selectable.equals("single") || selectable.equals("singleLeafOnly")
@@ -327,7 +326,7 @@
     }
 
     String selectable = ComponentUtil.getStringAttribute(this,
-        TobagoConstants.ATTR_SELECTABLE);
+        Attributes.SELECTABLE);
     if (selectable != null && selectable.endsWith("LeafOnly")) {
 
       Set<DefaultMutableTreeNode> selection = getState().getSelection();
@@ -424,7 +423,7 @@
     if (treeState != null) {
       return treeState;
     }
-    ValueBinding valueBinding = getValueBinding(TobagoConstants.ATTR_STATE);
+    ValueBinding valueBinding = getValueBinding(Attributes.STATE);
     if (valueBinding != null) {
       FacesContext facesContext = getFacesContext();
       TreeState state = (TreeState) valueBinding.getValue(facesContext);
@@ -447,7 +446,7 @@
     if (showJunctionsSet) {
       return (showJunctions);
     }
-    ValueBinding vb = getValueBinding(TobagoConstants.ATTR_SHOW_JUNCTIONS);
+    ValueBinding vb = getValueBinding(Attributes.SHOW_JUNCTIONS);
     if (vb != null) {
       return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
     } else {
@@ -464,7 +463,7 @@
     if (showIconsSet) {
       return (showIcons);
     }
-    ValueBinding vb = getValueBinding(TobagoConstants.ATTR_SHOW_ICONS);
+    ValueBinding vb = getValueBinding(Attributes.SHOW_ICONS);
     if (vb != null) {
       return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
     } else {
@@ -481,7 +480,7 @@
     if (showRootSet) {
       return (showRoot);
     }
-    ValueBinding vb = getValueBinding(TobagoConstants.ATTR_SHOW_ROOT);
+    ValueBinding vb = getValueBinding(Attributes.SHOW_ROOT);
     if (vb != null) {
       return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
     } else {
@@ -498,7 +497,7 @@
     if (showRootJunctionSet) {
       return (showRootJunction);
     }
-    ValueBinding vb = getValueBinding(TobagoConstants.ATTR_SHOW_ROOT_JUNCTION);
+    ValueBinding vb = getValueBinding(Attributes.SHOW_ROOT_JUNCTION);
     if (vb != null) {
       return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
     } else {
@@ -551,7 +550,7 @@
     if (mutable != null) {
       return mutable;
     }
-    ValueBinding vb = getValueBinding(TobagoConstants.ATTR_MUTABLE);
+    ValueBinding vb = getValueBinding(Attributes.MUTABLE);
     if (vb != null) {
       return (!Boolean.FALSE.equals(vb.getValue(getFacesContext())));
     } else {
@@ -582,7 +581,7 @@
     if (selectable != null) {
       return selectable;
     }
-    ValueBinding vb = getValueBinding(TobagoConstants.ATTR_SELECTABLE);
+    ValueBinding vb = getValueBinding(Attributes.SELECTABLE);
     if (vb != null) {
       String str = (String) vb.getValue(getFacesContext());
       if (str != null) {
@@ -623,7 +622,7 @@
     if (tabIndex != null) {
       return tabIndex;
     }
-    ValueBinding vb = getValueBinding(ATTR_TAB_INDEX);
+    ValueBinding vb = getValueBinding(Attributes.TAB_INDEX);
     if (vb != null) {
       Number number = (Number) vb.getValue(getFacesContext());
       if (number != null) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java Fri Oct 24 12:16:37 2008
@@ -120,7 +120,7 @@
       if (name == null) {
         name = toString();
       }
-      getAttributes().put(TobagoConstants.ATTR_NAME, name.toString());
+      getAttributes().put(Attributes.NAME, name.toString());
     }
   }
 
@@ -129,7 +129,7 @@
     if (treeNode != null) {
       Object tip = getReference(treeNode, UITreeOld.ATTR_TIP_REFERENCE);
       if (tip != null) {
-        getAttributes().put(TobagoConstants.ATTR_TIP, tip.toString());
+        getAttributes().put(Attributes.TIP, tip.toString());
       }
     }
   }
@@ -146,7 +146,7 @@
           disabled = false;
         }
       }
-      getAttributes().put(TobagoConstants.ATTR_DISABLED, disabled);
+      getAttributes().put(Attributes.DISABLED, disabled);
     }
   }
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/context/ClientProperties.java Fri Oct 24 12:16:37 2008
@@ -25,7 +25,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_CLIENT_PROPERTIES;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.config.TobagoConfig;
 
 import javax.faces.component.UIViewRoot;
@@ -126,13 +126,13 @@
       return getInstance(FacesContext.getCurrentInstance());
     }
     ClientProperties clientProperties = (ClientProperties)
-        viewRoot.getAttributes().get(ATTR_CLIENT_PROPERTIES);
+        viewRoot.getAttributes().get(Attributes.CLIENT_PROPERTIES);
     if (clientProperties == null) {
       if (LOG.isInfoEnabled()) {
         LOG.info("No ClientProperties instance found creating new one");
       }
       clientProperties = getInstance(FacesContext.getCurrentInstance());
-      viewRoot.getAttributes().put(ATTR_CLIENT_PROPERTIES, clientProperties);
+      viewRoot.getAttributes().put(Attributes.CLIENT_PROPERTIES, clientProperties);
       return clientProperties;
     }
     return clientProperties;

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/convert/DurationConverter.java Fri Oct 24 12:16:37 2008
@@ -19,7 +19,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_UNIT;
+import org.apache.myfaces.tobago.component.Attributes;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -119,7 +119,7 @@
   private static double getUnitFactor(UIComponent component) {
     String unit = null;
     if (component != null) {
-      unit = (String) component.getAttributes().get(ATTR_UNIT);
+      unit = (String) component.getAttributes().get(Attributes.UNIT);
     }
     double factor;
     if (unit == null) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/internal/taglib/TagUtils.java Fri Oct 24 12:16:37 2008
@@ -17,28 +17,28 @@
  * limitations under the License.
  */
 
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.myfaces.tobago.component.AbstractUIMessages;
+import org.apache.myfaces.tobago.component.Attributes;
+import org.apache.myfaces.tobago.component.InputSuggest;
+import org.apache.myfaces.tobago.el.ConstantMethodBinding;
 import org.apache.myfaces.tobago.event.SheetStateChangeSource;
 import org.apache.myfaces.tobago.event.SortActionSource;
 import org.apache.myfaces.tobago.event.TabChangeSource;
 import org.apache.myfaces.tobago.util.ComponentUtil;
-import org.apache.myfaces.tobago.component.AbstractUIMessages;
-import org.apache.myfaces.tobago.component.InputSuggest;
-import org.apache.myfaces.tobago.el.ConstantMethodBinding;
-import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.commons.beanutils.PropertyUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
-import javax.faces.component.UIComponent;
-import javax.faces.component.EditableValueHolder;
+import javax.faces.application.Application;
 import javax.faces.component.ActionSource;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.UIComponent;
 import javax.faces.component.ValueHolder;
-import javax.faces.webapp.UIComponentTag;
-import javax.faces.el.ValueBinding;
-import javax.faces.el.MethodBinding;
 import javax.faces.context.FacesContext;
-import javax.faces.application.Application;
 import javax.faces.convert.Converter;
+import javax.faces.el.MethodBinding;
+import javax.faces.el.ValueBinding;
+import javax.faces.webapp.UIComponentTag;
 import java.lang.reflect.InvocationTargetException;
 
 
@@ -53,7 +53,7 @@
         if ((component instanceof org.apache.myfaces.tobago.component.AbstractUIPage
             || component instanceof javax.faces.component.UIGraphic
             || component instanceof org.apache.myfaces.tobago.component.AbstractUIPopup)
-            && (TobagoConstants.ATTR_WIDTH.equals(name) || TobagoConstants.ATTR_HEIGHT.equals(name))) {
+            && (Attributes.WIDTH.equals(name) || Attributes.HEIGHT.equals(name))) {
           if (value.endsWith("px")) {
             value = value.substring(0, value.length() - 2);
           }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/model/MixedTreeModel.java Fri Oct 24 12:16:37 2008
@@ -19,9 +19,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
 import org.apache.myfaces.tobago.component.AbstractUITreeData;
 import org.apache.myfaces.tobago.component.AbstractUITreeNode;
+import org.apache.myfaces.tobago.component.Attributes;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 import java.util.ArrayList;
@@ -45,10 +45,10 @@
 
   public void beginBuildNode(AbstractUITreeNode node) {
     if (LOG.isDebugEnabled()) {
-      LOG.debug(node.getAttributes().get(ATTR_LABEL));
+      LOG.debug(node.getAttributes().get(Attributes.LABEL));
     }
     if (!isInData) {
-      DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(node.getAttributes().get(ATTR_LABEL));
+      DefaultMutableTreeNode newNode = new DefaultMutableTreeNode(node.getAttributes().get(Attributes.LABEL));
       if (root == null) {
         root = newNode;
         current = root;
@@ -61,7 +61,7 @@
 
   public void endBuildNode(AbstractUITreeNode node) {
     if (LOG.isDebugEnabled()) {
-      LOG.debug(node.getAttributes().get(ATTR_LABEL));
+      LOG.debug(node.getAttributes().get(Attributes.LABEL));
     }
     if (!isInData) {
       current = (DefaultMutableTreeNode) current.getParent();

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java Fri Oct 24 12:16:37 2008
@@ -25,9 +25,9 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HEIGHT;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.UILayout;
+import org.apache.myfaces.tobago.util.ComponentUtil;
 import org.apache.myfaces.tobago.util.LayoutUtil;
 
 import javax.faces.component.UIComponent;
@@ -44,7 +44,7 @@
   public int getFixedHeight(FacesContext facesContext, UIComponent component) {
 
     int height =
-        ComponentUtil.getIntAttribute(component, ATTR_HEIGHT, -1);
+        ComponentUtil.getIntAttribute(component, Attributes.HEIGHT, -1);
     if (height != -1) {
       return height;
     }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/HtmlUtils.java Fri Oct 24 12:16:37 2008
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_ONCHANGE;
+import org.apache.myfaces.tobago.component.Attributes;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
@@ -68,7 +68,7 @@
       }
     } */
 
-    Object onchange = component.getAttributes().get(ATTR_ONCHANGE);
+    Object onchange = component.getAttributes().get(Attributes.ONCHANGE);
     if (onchange != null) {
       return onchange.toString();
     }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LabelWithAccessKey.java Fri Oct 24 12:16:37 2008
@@ -17,12 +17,11 @@
  * limitations under the License.
  */
 
+import org.apache.commons.lang.StringUtils;
 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_LABEL;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
 import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_LABEL;
+import org.apache.myfaces.tobago.component.Attributes;
 
 import javax.faces.component.UIComponent;
 import java.util.Locale;
@@ -40,9 +39,9 @@
   public LabelWithAccessKey(UIComponent component) {
     Object value;
     if (RENDERER_TYPE_LABEL.equals(component.getRendererType())) {
-      value = component.getAttributes().get(ATTR_VALUE);
+      value = component.getAttributes().get(Attributes.VALUE);
     } else {
-      value = component.getAttributes().get(ATTR_LABEL);
+      value = component.getAttributes().get(Attributes.LABEL);
     }
     text = (value == null) ? null : String.valueOf(value);
     setup(text);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutableRendererBase.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutableRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/LayoutableRendererBase.java Fri Oct 24 12:16:37 2008
@@ -19,10 +19,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HEIGHT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_HEIGHT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_WIDTH;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Cell;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
@@ -126,9 +123,9 @@
       }
     } else {
       if (width) {
-        fixedSpace = getFixedSpace(facesContext, component, ATTR_WIDTH, "fixedWidth");
+        fixedSpace = getFixedSpace(facesContext, component, Attributes.WIDTH, "fixedWidth");
       } else {
-        fixedSpace = getFixedSpace(facesContext, component, ATTR_HEIGHT, "fixedHeight");
+        fixedSpace = getFixedSpace(facesContext, component, Attributes.HEIGHT, "fixedHeight");
       }
     }
     return fixedSpace;
@@ -190,7 +187,7 @@
     if (layoutWidth != null) {
       int space = layoutWidth.intValue();
       int innerSpace = LayoutUtil.getInnerSpace(facesContext, component, space, true);
-      component.getAttributes().put(ATTR_INNER_WIDTH, Integer.valueOf(innerSpace));
+      component.getAttributes().put(Attributes.INNER_WIDTH, Integer.valueOf(innerSpace));
     }
   }
 
@@ -199,7 +196,7 @@
     if (layoutHeight != null) {
       int space = layoutHeight.intValue();
       int innerSpace = LayoutUtil.getInnerSpace(facesContext, component, space, false);
-      component.getAttributes().put(ATTR_INNER_HEIGHT, Integer.valueOf(innerSpace));
+      component.getAttributes().put(Attributes.INNER_HEIGHT, Integer.valueOf(innerSpace));
     }
   }
 
@@ -211,11 +208,11 @@
     String styleAttribute;
     if (width) {
       layoutSpace = LayoutUtil.getLayoutWidth(component);
-      layoutAttribute = org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_WIDTH;
+      layoutAttribute = Attributes.LAYOUT_WIDTH;
       styleAttribute = HtmlAttributes.WIDTH;
     } else {
       layoutSpace = LayoutUtil.getLayoutHeight(component);
-      layoutAttribute = org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_HEIGHT;
+      layoutAttribute = Attributes.LAYOUT_HEIGHT;
       styleAttribute = HtmlAttributes.HEIGHT;
     }
     int space = -1;
@@ -229,15 +226,15 @@
       if (space > 0 && !ComponentUtil.isFacetOf(component, parent)) {
         component.getAttributes().put(layoutAttribute, Integer.valueOf(space));
         if (width) {
-          component.getAttributes().remove(org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_WIDTH);
+          component.getAttributes().remove(Attributes.INNER_WIDTH);
         } else {
-          component.getAttributes().remove(org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_HEIGHT);
+          component.getAttributes().remove(Attributes.INNER_HEIGHT);
         }
       }
     }
     if (space > 0) {
       if (layoutSpace != null
-          || !ComponentUtil.getBooleanAttribute(component, org.apache.myfaces.tobago.TobagoConstants.ATTR_INLINE)) {
+          || !ComponentUtil.getBooleanAttribute(component, Attributes.INLINE)) {
         int styleSpace = space;
           if (width) {
             styleSpace -= getComponentExtraWidth(facesContext, component);
@@ -265,7 +262,7 @@
     }
 
   private HtmlStyleMap ensureStyleAttributeMap(UIComponent component) {
-    return ensureStyleAttributeMap(component, org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE);
+    return ensureStyleAttributeMap(component, Attributes.STYLE);
   }
 
   private HtmlStyleMap ensureStyleAttributeMap(UIComponent component, String attribute) {

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=707725&r1=707724&r2=707725&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 Fri Oct 24 12:16:37 2008
@@ -18,17 +18,14 @@
  */
 
 import org.apache.commons.collections.set.ListOrderedSet;
+import org.apache.commons.lang.StringUtils;
 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;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_CLASS;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
 import org.apache.myfaces.tobago.context.ClientProperties;
 import org.apache.myfaces.tobago.context.Theme;
+import org.apache.myfaces.tobago.util.ComponentUtil;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIInput;
@@ -65,10 +62,10 @@
 
   public static StyleClasses ensureStyleClasses(UIComponent component) {
     Map attributes = component.getAttributes();
-    StyleClasses classes = (StyleClasses) attributes.get(ATTR_STYLE_CLASS);
+    StyleClasses classes = (StyleClasses) attributes.get(Attributes.STYLE_CLASS);
     if (classes == null) {
       classes = new StyleClasses();
-      attributes.put(ATTR_STYLE_CLASS, classes);
+      attributes.put(Attributes.STYLE_CLASS, classes);
     }
     return classes;
   }
@@ -216,13 +213,13 @@
     removeTobagoClasses(rendererName);
 
     addAspectClass(rendererName, Aspect.DEFAULT);
-    if (ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED)) {
+    if (ComponentUtil.getBooleanAttribute(component, Attributes.DISABLED)) {
       addAspectClass(rendererName, Aspect.DISABLED);
     }
-    if (ComponentUtil.getBooleanAttribute(component, ATTR_READONLY)) {
+    if (ComponentUtil.getBooleanAttribute(component, Attributes.READONLY)) {
       addAspectClass(rendererName, Aspect.READONLY);
     }
-    if (ComponentUtil.getBooleanAttribute(component, ATTR_INLINE)) {
+    if (ComponentUtil.getBooleanAttribute(component, Attributes.INLINE)) {
       addAspectClass(rendererName, Aspect.INLINE);
     }
     if (component instanceof UIInput) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/AttributeTag.java Fri Oct 24 12:16:37 2008
@@ -17,14 +17,14 @@
  * limitations under the License.
  */
 
-import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.compat.FacesUtils;
-import org.apache.myfaces.tobago.util.ComponentUtil;
 import org.apache.myfaces.tobago.apt.annotation.BodyContent;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.TagGeneration;
+import org.apache.myfaces.tobago.compat.FacesUtils;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
+import org.apache.myfaces.tobago.util.ComponentUtil;
 
 import javax.faces.component.UIComponent;
 import javax.faces.webapp.UIComponentTag;
@@ -105,9 +105,9 @@
         // TODO Message resource i18n
         throw new JspException("Can not get ValueBinding for attribute value " + getValueExpression());
       }
-    } else if (TobagoConstants.ATTR_STYLE_CLASS.equals(attributeName)) {
+    } else if (Attributes.STYLE_CLASS.equals(attributeName)) {
       ComponentUtil.setStyleClasses(component, getValueValue());
-    } else if (TobagoConstants.ATTR_RENDERED_PARTIALLY.equals(attributeName)
+    } else if (Attributes.RENDERED_PARTIALLY.equals(attributeName)
         && component instanceof SupportsRenderedPartially) {
       String[] components = ComponentUtil.splitList(getValueValue());
       ((SupportsRenderedPartially) component).setRenderedPartially(components);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ConverterTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ConverterTag.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ConverterTag.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/taglib/component/ConverterTag.java Fri Oct 24 12:16:37 2008
@@ -17,12 +17,12 @@
  * limitations under the License.
  */
 
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_CONVERTER;
 import org.apache.myfaces.tobago.apt.annotation.BodyContent;
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.TagGeneration;
 import org.apache.myfaces.tobago.compat.FacesUtils;
+import org.apache.myfaces.tobago.component.Attributes;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.ValueHolder;
@@ -110,7 +110,7 @@
     if (converter != null) {
       if (!isBindingLiteral()) {
         FacesUtils.
-            setValueOfBindingOrExpression(FacesContext.getCurrentInstance(), converter, component, ATTR_CONVERTER);
+            setValueOfBindingOrExpression(FacesContext.getCurrentInstance(), converter, component, Attributes.CONVERTER);
       } else {
         valueHolder.setConverter(converter);
       }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtil.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/ComponentUtil.java Fri Oct 24 12:16:37 2008
@@ -25,19 +25,11 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_CONVERTER;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_FOR;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HOVER;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_MARKUP;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_READONLY;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_CLASS;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
 import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_LABEL;
 import org.apache.myfaces.tobago.component.AbstractUIForm;
 import org.apache.myfaces.tobago.component.AbstractUIPage;
 import org.apache.myfaces.tobago.component.AbstractUIPopup;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
 import org.apache.myfaces.tobago.component.UIInputBase;
@@ -254,7 +246,7 @@
   }
 
   public static UIComponent findFor(UIComponent component) {
-    String forValue = (String) component.getAttributes().get(ATTR_FOR);
+    String forValue = (String) component.getAttributes().get(Attributes.FOR);
     if (forValue == null) {
       return component.getParent();
     }
@@ -294,8 +286,8 @@
   }
 
   public static boolean isOutputOnly(UIComponent component) {
-    return getBooleanAttribute(component, ATTR_DISABLED)
-        || getBooleanAttribute(component, ATTR_READONLY);
+    return getBooleanAttribute(component, Attributes.DISABLED)
+        || getBooleanAttribute(component, Attributes.READONLY);
   }
 
   public static boolean mayValidate(UIComponent component) {
@@ -350,7 +342,7 @@
   public static void setStyleClasses(UIComponent component, String styleClasses) {
     if (styleClasses != null) {
       if (UIComponentTag.isValueReference(styleClasses)) {
-        component.setValueBinding(ATTR_STYLE_CLASS, createValueBinding(styleClasses));
+        component.setValueBinding(Attributes.STYLE_CLASS, createValueBinding(styleClasses));
       } else {
         String[] classes = splitList(styleClasses);
         if (classes.length > 0) {
@@ -367,7 +359,7 @@
     if (markup != null) {
       if (markupComponent instanceof SupportsMarkup) {
         if (UIComponentTag.isValueReference(markup)) {
-          markupComponent.setValueBinding(ATTR_MARKUP, createValueBinding(markup));
+          markupComponent.setValueBinding(Attributes.MARKUP, createValueBinding(markup));
         } else {
           String[] markups = splitList(markup);
           ((SupportsMarkup) markupComponent).setMarkup(markups);
@@ -593,7 +585,7 @@
   }
 
   public static boolean isHoverEnabled(UIComponent component) {
-    return ComponentUtil.getBooleanAttribute(component, ATTR_HOVER);
+    return ComponentUtil.getBooleanAttribute(component, Attributes.HOVER);
   }
 
   public static UIOutput getFirstNonGraphicChild(UIComponent component) {
@@ -682,9 +674,9 @@
 
     if (label == null) {
       final Map attributes = component.getAttributes();
-      Object labelText = component.getValueBinding(ATTR_LABEL);
+      Object labelText = component.getValueBinding(Attributes.LABEL);
       if (labelText == null) {
-        labelText = attributes.get(ATTR_LABEL);
+        labelText = attributes.get(Attributes.LABEL);
       }
 
       if (labelText != null) {
@@ -696,9 +688,9 @@
         label.setRendered(true);
 
         if (labelText instanceof ValueBinding) {
-          label.setValueBinding(ATTR_VALUE, (ValueBinding) labelText);
+          label.setValueBinding(Attributes.VALUE, (ValueBinding) labelText);
         } else {
-          label.getAttributes().put(ATTR_VALUE, labelText);
+          label.getAttributes().put(Attributes.VALUE, labelText);
         }
 
         component.getFacets().put(Facets.LABEL, label);
@@ -751,7 +743,7 @@
       if (UIComponentTag.isValueReference(converterId)) {
         ValueBinding valueBinding = application.createValueBinding(converterId);
         if (valueHolder instanceof UIComponent) {
-          ((UIComponent) valueHolder).setValueBinding(ATTR_CONVERTER, valueBinding);
+          ((UIComponent) valueHolder).setValueBinding(Attributes.CONVERTER, valueBinding);
         }
       } else {
         Converter converter = application.createConverter(converterId);
@@ -818,7 +810,7 @@
 
 
   public static String[] getMarkupBinding(FacesContext facesContext, SupportsMarkup component) {
-    ValueBinding vb = ((UIComponent) component).getValueBinding(ATTR_MARKUP);
+    ValueBinding vb = ((UIComponent) component).getValueBinding(Attributes.MARKUP);
     if (vb != null) {
       Object markups = vb.getValue(facesContext);
       if (markups instanceof String[]) {

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/util/LayoutUtil.java Fri Oct 24 12:16:37 2008
@@ -19,14 +19,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HEIGHT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INLINE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_HEIGHT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_INNER_WIDTH;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_HEIGHT;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LAYOUT_WIDTH;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_WIDTH;
 import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_OUT;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Cell;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.Form;
@@ -56,9 +50,9 @@
       UIComponent component, boolean width) {
     String attribute;
     if (width) {
-      attribute = ATTR_INNER_WIDTH;
+      attribute = Attributes.INNER_WIDTH;
     } else {
-      attribute = ATTR_INNER_HEIGHT;
+      attribute = Attributes.INNER_HEIGHT;
     }
     Integer innerSpace = (Integer) component.getAttributes().get(attribute);
 
@@ -126,7 +120,7 @@
     if (component != null) {
       UIComponent label = component.getFacet(Facets.LABEL);
       if (label != null) {
-        String labelWidth = (String) label.getAttributes().get(ATTR_WIDTH);
+        String labelWidth = (String) label.getAttributes().get(Attributes.WIDTH);
         if (labelWidth != null) {
           try {
             return Integer.parseInt(labelWidth.replaceAll("\\D", ""));
@@ -141,12 +135,12 @@
 
   //TODO Change this to DimensionUtils.getWidth?
   public static Integer getLayoutWidth(UIComponent component) {
-    return getLayoutSpace(component, ATTR_WIDTH, ATTR_LAYOUT_WIDTH);
+    return getLayoutSpace(component, Attributes.WIDTH, Attributes.LAYOUT_WIDTH);
   }
 
   //TODO Change this to DimensionUtils.getHeight?
   public static Integer getLayoutHeight(UIComponent component) {
-    return getLayoutSpace(component, ATTR_HEIGHT, ATTR_LAYOUT_HEIGHT);
+    return getLayoutSpace(component, Attributes.HEIGHT, Attributes.LAYOUT_HEIGHT);
   }
 
   public static Integer getLayoutSpace(UIComponent component,
@@ -158,7 +152,7 @@
       } else {
         return (Integer) value;
       }
-    } else if (!ComponentUtil.getBooleanAttribute(component, ATTR_INLINE)) {
+    } else if (!ComponentUtil.getBooleanAttribute(component, Attributes.INLINE)) {
 
       value = ComponentUtil.getAttribute(component, layoutAttribute);
       return (Integer) value;
@@ -217,10 +211,10 @@
       LOG.debug("set " + value + " to " + cell.getRendererType());
     }
     cell.getAttributes().put(attribute, value);
-    if (ATTR_LAYOUT_WIDTH.equals(attribute)) {
-      cell.getAttributes().remove(ATTR_INNER_WIDTH);
-    } else if (ATTR_LAYOUT_HEIGHT.equals(attribute)) {
-      cell.getAttributes().remove(ATTR_INNER_HEIGHT);
+    if (Attributes.LAYOUT_WIDTH.equals(attribute)) {
+      cell.getAttributes().remove(Attributes.INNER_WIDTH);
+    } else if (Attributes.LAYOUT_HEIGHT.equals(attribute)) {
+      cell.getAttributes().remove(Attributes.INNER_HEIGHT);
     }
     if (cell instanceof Cell) {
       List<UIComponent> children = addChildren(new ArrayList<UIComponent>(), cell);

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterImpl.java Fri Oct 24 12:16:37 2008
@@ -20,8 +20,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_CLASS;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
 import org.apache.myfaces.tobago.util.HtmlWriterUtil;
@@ -32,10 +31,10 @@
 import java.io.IOException;
 import java.io.Writer;
 import java.util.Arrays;
+import java.util.EmptyStackException;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.Stack;
-import java.util.EmptyStackException;
 
 public class TobagoResponseWriterImpl extends TobagoResponseWriter {
 
@@ -389,14 +388,14 @@
   }
 
   public void writeClassAttribute() throws IOException {
-    Object clazz = component.getAttributes().get(ATTR_STYLE_CLASS);
+    Object clazz = component.getAttributes().get(Attributes.STYLE_CLASS);
     if (clazz != null) {
       writeAttribute(HtmlAttributes.CLASS, clazz.toString(), false);
     }
   }
 
   public void writeStyleAttribute() throws IOException {
-    Object style = component.getAttributes().get(ATTR_STYLE);
+    Object style = component.getAttributes().get(Attributes.STYLE);
     if (style != null) {
       writeAttribute(HtmlAttributes.STYLE, style.toString(), false);
     }

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterWrapper.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterWrapper.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/webapp/TobagoResponseWriterWrapper.java Fri Oct 24 12:16:37 2008
@@ -17,9 +17,8 @@
  * limitations under the License.
  */
 
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE_CLASS;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.ResponseWriter;
@@ -76,11 +75,11 @@
   }
 
   public void writeClassAttribute() throws IOException {
-    responseWriter.writeAttribute(HtmlAttributes.CLASS, null, ATTR_STYLE_CLASS);
+    responseWriter.writeAttribute(HtmlAttributes.CLASS, null, Attributes.STYLE_CLASS);
   }
 
   public void writeStyleAttribute() throws IOException {
-    responseWriter.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
+    responseWriter.writeAttribute(HtmlAttributes.STYLE, null, Attributes.STYLE);
   }
 
   public String getContentType() {

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/convert/DurationConverterUnitTest.java Fri Oct 24 12:16:37 2008
@@ -18,7 +18,7 @@
  */
 
 import junit.framework.TestCase;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_UNIT;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.UIInput;
 
 import javax.faces.convert.Converter;
@@ -73,7 +73,7 @@
         + " long='" + aLong + "'";
     String result;
     if (unit != null) {
-      input.getAttributes().put(ATTR_UNIT, unit);
+      input.getAttributes().put(Attributes.UNIT, unit);
     }
     result = converter.getAsString(null, input, aLong);
     assertEquals(info, string, result);
@@ -86,7 +86,7 @@
         + " string='" + string + "'";
     Long result;
     if (unit != null) {
-      input.getAttributes().put(ATTR_UNIT, unit);
+      input.getAttributes().put(Attributes.UNIT, unit);
     }
     result = (Long) converter.getAsObject(null, input, string);
     assertEquals(info, aLong, result);

Modified: myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java (original)
+++ myfaces/tobago/trunk/core/src/test/java/org/apache/myfaces/tobago/taglib/component/GenericComponentTagUnitTest.java Fri Oct 24 12:16:37 2008
@@ -19,19 +19,18 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_HEIGHT;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.config.TobagoConfig;
-import org.apache.myfaces.tobago.context.Theme;
 import org.apache.myfaces.tobago.context.RenderersConfig;
+import org.apache.myfaces.tobago.context.Theme;
 import org.apache.myfaces.tobago.internal.taglib.TobagoTag;
-import org.apache.myfaces.tobago.mock.faces.MockFacesContext;
 import org.apache.myfaces.tobago.mock.faces.MockExternalContext;
+import org.apache.myfaces.tobago.mock.faces.MockFacesContext;
 import org.apache.myfaces.tobago.mock.faces.MockRenderKit;
-import org.apache.myfaces.tobago.mock.servlet.MockServletContext;
 import org.apache.myfaces.tobago.mock.servlet.MockHttpServletRequest;
 import org.apache.myfaces.tobago.mock.servlet.MockHttpServletResponse;
+import org.apache.myfaces.tobago.mock.servlet.MockServletContext;
+import org.apache.myfaces.tobago.util.ComponentUtil;
 
 import javax.faces.FactoryFinder;
 import javax.faces.application.Application;
@@ -43,20 +42,16 @@
 import javax.faces.lifecycle.Lifecycle;
 import javax.faces.render.RenderKit;
 import javax.faces.render.RenderKitFactory;
-import javax.faces.webapp.UIComponentTag;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
 import javax.servlet.jsp.tagext.Tag;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.List;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.Collections;
-
-import net.sf.maventaglib.checker.Tld;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
 
 public class GenericComponentTagUnitTest extends GenericTestBase {
 
@@ -159,18 +154,18 @@
       tobagoTag.doStartTag();
       UIComponent component = tobagoTag.getComponentInstance();
       UICommand command = (UICommand) component;
-      Object disabled = component.getAttributes().get(ATTR_DISABLED);
+      Object disabled = component.getAttributes().get(Attributes.DISABLED);
       LOG.debug("disabled = '" + disabled + "'");
       Map attributes = component.getAttributes();
       for (Iterator i = attributes.keySet().iterator(); i.hasNext();) {
         Object value = i.next();
         LOG.debug("value = " + value);
       }
-      Object height = attributes.get(ATTR_HEIGHT);
+      Object height = attributes.get(Attributes.HEIGHT);
       LOG.debug("height = '" + height + "'");
 
-      assertTrue(ComponentUtil.getBooleanAttribute(command, ATTR_DISABLED));
-      assertFalse(ComponentUtil.getBooleanAttribute(command, ATTR_HEIGHT));
+      assertTrue(ComponentUtil.getBooleanAttribute(command, Attributes.DISABLED));
+      assertFalse(ComponentUtil.getBooleanAttribute(command, Attributes.HEIGHT));
     }
   }
   private static class MockTheme implements Theme {

Modified: myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java (original)
+++ myfaces/tobago/trunk/example/demo/src/main/java/org/apache/myfaces/tobago/example/demo/TobagoDemoController.java Fri Oct 24 12:16:37 2008
@@ -23,8 +23,8 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_VALUE;
 import static org.apache.myfaces.tobago.TobagoConstants.RENDERER_TYPE_IN;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.CreateComponentUtils;
 import org.apache.myfaces.tobago.component.UIInput;
 import org.apache.myfaces.tobago.component.UIToolBar;
@@ -39,8 +39,8 @@
 import javax.faces.application.FacesMessage;
 import javax.faces.component.UIColumn;
 import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
 import javax.faces.context.ExternalContext;
+import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 import javax.faces.model.SelectItem;
 import javax.faces.validator.ValidatorException;
@@ -250,7 +250,7 @@
       UIInput textbox = (UIInput)
         CreateComponentUtils.createComponent(facesContext, UIInput.COMPONENT_TYPE, RENDERER_TYPE_IN, "sac1i");
     ComponentUtil.setStringProperty(
-        textbox, ATTR_VALUE, "#{luminary.population}");
+        textbox, Attributes.VALUE, "#{luminary.population}");
     columns.add(CreateComponentUtils.createColumn(
         "#{overviewBundle.solarArrayPopulation}", "true", null, textbox, "sac1"));
 

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java Fri Oct 24 12:16:37 2008
@@ -29,7 +29,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.tobago.TobagoConstants;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
 import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
 import org.apache.myfaces.tobago.el.ConstantMethodBinding;
@@ -58,9 +58,9 @@
 
   public AttributeHandler(TagConfig config) {
     super(config);
-    this.name = getRequiredAttribute(TobagoConstants.ATTR_NAME);
-    this.value = getRequiredAttribute(TobagoConstants.ATTR_VALUE);
-    this.mode = getAttribute(TobagoConstants.ATTR_MODE);
+    this.name = getRequiredAttribute(Attributes.NAME);
+    this.value = getRequiredAttribute(Attributes.VALUE);
+    this.mode = getAttribute(Attributes.MODE);
   }
 
   public void apply(FaceletContext faceletContext, UIComponent parent)
@@ -211,13 +211,13 @@
       } else {
 
         String nameValue = name.getValue(faceletContext);
-        if (TobagoConstants.ATTR_RENDERED.equals(nameValue)) {
+        if (Attributes.RENDERED.equals(nameValue)) {
           if (value.isLiteral()) {
             parent.setRendered(value.getBoolean(faceletContext));
           } else {
             ELAdaptor.setExpression(parent, nameValue, value.getValueExpression(faceletContext, Boolean.class));
           }
-        } else if (TobagoConstants.ATTR_RENDERED_PARTIALLY.equals(nameValue)
+        } else if (Attributes.RENDERED_PARTIALLY.equals(nameValue)
             && parent instanceof SupportsRenderedPartially) {
 
           if (value.isLiteral()) {
@@ -226,10 +226,10 @@
           } else {
             ELAdaptor.setExpression(parent, nameValue, value.getValueExpression(faceletContext, Object.class));
           }
-        } else if (TobagoConstants.ATTR_STYLE_CLASS.equals(nameValue)) {
+        } else if (Attributes.STYLE_CLASS.equals(nameValue)) {
           // TODO expression
           ComponentUtil.setStyleClasses(parent, value.getValue());
-        } else if (TobagoConstants.ATTR_MARKUP.equals(nameValue)) {
+        } else if (Attributes.MARKUP.equals(nameValue)) {
           if (parent instanceof SupportsMarkup) {
             if (value.isLiteral()) {
               ComponentUtil.setMarkup(parent, value.getValue());
@@ -240,29 +240,29 @@
           } else {
             LOG.error("Component is not instanceof SupportsMarkup. Instance is: " + parent.getClass().getName());
           }
-        } else if (parent instanceof EditableValueHolder && TobagoConstants.ATTR_VALIDATOR.equals(nameValue)) {
+        } else if (parent instanceof EditableValueHolder && Attributes.VALIDATOR.equals(nameValue)) {
           MethodExpression methodExpression = getMethodExpression(faceletContext, null, ComponentUtil.VALIDATOR_ARGS);
           if (methodExpression != null) {
             // TODO jsf 1.2
             ((EditableValueHolder) parent).setValidator(new LegacyMethodBinding(methodExpression));
           }
         } else if (parent instanceof EditableValueHolder
-            && TobagoConstants.ATTR_VALUE_CHANGE_LISTENER.equals(nameValue)) {
+            && Attributes.VALUE_CHANGE_LISTENER.equals(nameValue)) {
           MethodExpression methodExpression =
               getMethodExpression(faceletContext, null, ComponentUtil.VALUE_CHANGE_LISTENER_ARGS);
           if (methodExpression != null) {
             // TODO jsf 1.2
             ((EditableValueHolder) parent).setValueChangeListener(new LegacyMethodBinding(methodExpression));
           }
-        } else if (parent instanceof ValueHolder && TobagoConstants.ATTR_CONVERTER.equals(nameValue)) {
+        } else if (parent instanceof ValueHolder && Attributes.CONVERTER.equals(nameValue)) {
           setConverter(faceletContext, parent, nameValue);
-        } else if (parent instanceof ActionSource && TobagoConstants.ATTR_ACTION.equals(nameValue)) {
+        } else if (parent instanceof ActionSource && Attributes.ACTION.equals(nameValue)) {
           MethodExpression action = getMethodExpression(faceletContext, String.class, ComponentUtil.ACTION_ARGS);
           if (action != null) {
             // TODO jsf 1.2
             ((ActionSource) parent).setAction(new LegacyMethodBinding(action));
           }
-        } else if (parent instanceof ActionSource && TobagoConstants.ATTR_ACTION_LISTENER.equals(nameValue)) {
+        } else if (parent instanceof ActionSource && Attributes.ACTION_LISTENER.equals(nameValue)) {
           MethodExpression action = getMethodExpression(faceletContext, null, ComponentUtil.ACTION_LISTENER_ARGS);
           if (action != null) {
             // TODO jsf 1.2

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PageRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PageRule.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PageRule.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PageRule.java Fri Oct 24 12:16:37 2008
@@ -17,15 +17,15 @@
  * limitations under the License.
  */
 
-import com.sun.facelets.tag.MetadataTarget;
+import com.sun.facelets.FaceletContext;
+import com.sun.facelets.el.LegacyValueBinding;
 import com.sun.facelets.tag.MetaRule;
 import com.sun.facelets.tag.Metadata;
+import com.sun.facelets.tag.MetadataTarget;
 import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.FaceletContext;
-import com.sun.facelets.el.LegacyValueBinding;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.UIPage;
 import org.apache.myfaces.tobago.util.ComponentUtil;
-import org.apache.myfaces.tobago.TobagoConstants;
 
 import javax.faces.component.UIComponent;
 
@@ -41,10 +41,10 @@
       MetadataTarget metadataTarget) {
     if (metadataTarget.isTargetInstanceOf(UIPage.class)) {
       if (attribute.isLiteral()) {
-        if (TobagoConstants.ATTR_WIDTH.equals(name)) {
+        if (Attributes.WIDTH.equals(name)) {
           return new PageWidthMapper(attribute);
         }
-        if (TobagoConstants.ATTR_HEIGHT.equals(name)) {
+        if (Attributes.HEIGHT.equals(name)) {
           return new PageHeightMapper(attribute);
         }
       }

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/PopupReferenceHandler.java Fri Oct 24 12:16:37 2008
@@ -17,12 +17,14 @@
  * limitations under the License.
  */
 
-import com.sun.facelets.tag.TagHandler;
-import com.sun.facelets.tag.TagConfig;
+import com.sun.facelets.FaceletContext;
 import com.sun.facelets.tag.TagAttribute;
+import com.sun.facelets.tag.TagConfig;
 import com.sun.facelets.tag.TagException;
+import com.sun.facelets.tag.TagHandler;
 import com.sun.facelets.tag.jsf.ComponentSupport;
-import com.sun.facelets.FaceletContext;
+import org.apache.myfaces.tobago.component.Attributes;
+import org.apache.myfaces.tobago.event.PopupActionListener;
 
 import javax.el.ELException;
 import javax.faces.FacesException;
@@ -30,9 +32,6 @@
 import javax.faces.component.UIComponent;
 import java.io.IOException;
 
-import org.apache.myfaces.tobago.event.PopupActionListener;
-import org.apache.myfaces.tobago.TobagoConstants;
-
 /*
  * User: bommel
  * Date: Jan 4, 2007
@@ -44,7 +43,7 @@
 
   public PopupReferenceHandler(TagConfig config) {
     super(config);
-    forComponent = getAttribute(TobagoConstants.ATTR_FOR);
+    forComponent = getAttribute(Attributes.FOR);
   }
 
   public void apply(FaceletContext faceletContext, UIComponent parent)

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/SupportsMarkupRule.java Fri Oct 24 12:16:37 2008
@@ -17,18 +17,18 @@
  * limitations under the License.
  */
 
-import com.sun.facelets.tag.Metadata;
-import com.sun.facelets.tag.TagAttribute;
-import com.sun.facelets.tag.MetadataTarget;
-import com.sun.facelets.tag.MetaRule;
 import com.sun.facelets.FaceletContext;
 import com.sun.facelets.el.ELAdaptor;
-import org.apache.myfaces.tobago.util.ComponentUtil;
+import com.sun.facelets.tag.MetaRule;
+import com.sun.facelets.tag.Metadata;
+import com.sun.facelets.tag.MetadataTarget;
+import com.sun.facelets.tag.TagAttribute;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
-import org.apache.myfaces.tobago.TobagoConstants;
+import org.apache.myfaces.tobago.util.ComponentUtil;
 
-import javax.faces.component.UIComponent;
 import javax.el.ValueExpression;
+import javax.faces.component.UIComponent;
 
 /*
  * User: bommel
@@ -41,7 +41,7 @@
   public Metadata applyRule(String name, TagAttribute attribute,
       MetadataTarget metadataTarget) {
     if (metadataTarget.isTargetInstanceOf(SupportsMarkup.class)) {
-      if (TobagoConstants.ATTR_MARKUP.equals(name)) {
+      if (Attributes.MARKUP.equals(name)) {
         return new SupportsMarkupMapper(attribute);
       }
     }
@@ -61,7 +61,7 @@
         ComponentUtil.setMarkup((UIComponent) instance, attribute.getValue());
       } else {
         ValueExpression expression = attribute.getValueExpression(ctx, Object.class);
-        ELAdaptor.setExpression((UIComponent) instance, TobagoConstants.ATTR_MARKUP, expression);
+        ELAdaptor.setExpression((UIComponent) instance, Attributes.MARKUP, expression);
       }
     }
   }

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/SeparatorExtensionHandler.java Fri Oct 24 12:16:37 2008
@@ -24,7 +24,7 @@
 import com.sun.facelets.tag.jsf.ComponentConfig;
 import com.sun.facelets.tag.jsf.ComponentHandler;
 import com.sun.facelets.tag.jsf.ComponentSupport;
-import org.apache.myfaces.tobago.TobagoConstants;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.UILabel;
 import org.apache.myfaces.tobago.component.UISeparator;
@@ -43,7 +43,7 @@
 
   public SeparatorExtensionHandler(ComponentConfig config) {
     super(config);
-    labelAttribute = getAttribute(TobagoConstants.ATTR_LABEL);
+    labelAttribute = getAttribute(Attributes.LABEL);
   }
 
   protected void applyNextHandler(FaceletContext faceletContext, UIComponent separator)
@@ -70,7 +70,7 @@
         label.setValue(labelAttribute.getValue(faceletContext));
       } else {
         ValueExpression expression = labelAttribute.getValueExpression(faceletContext, String.class);
-        ELAdaptor.setExpression(label, TobagoConstants.ATTR_VALUE, expression);
+        ELAdaptor.setExpression(label, Attributes.VALUE, expression);
       }
     }
   }
@@ -78,7 +78,7 @@
   protected MetaRuleset createMetaRuleset(Class aClass) {
     MetaRuleset metaRuleset = super.createMetaRuleset(aClass);
     if (UISeparator.class.isAssignableFrom(aClass)) {
-      metaRuleset.ignore(TobagoConstants.ATTR_LABEL);
+      metaRuleset.ignore(Attributes.LABEL);
       return metaRuleset;
     } else {
       TagAttribute[] attrs = tag.getAttributes().getAll();

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Fri Oct 24 12:16:37 2008
@@ -27,6 +27,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.myfaces.tobago.TobagoConstants;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.InputSuggest;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
@@ -62,9 +63,9 @@
   public TobagoLabelExtensionHandler(ComponentConfig config) {
     super(config);
     labelWidthAttribute = getAttribute("labelWidth");
-    tipAttribute = getAttribute(TobagoConstants.ATTR_TIP);
-    labelAttribute = getAttribute(TobagoConstants.ATTR_LABEL);
-    markupAttribute = getAttribute(TobagoConstants.ATTR_MARKUP);
+    tipAttribute = getAttribute(Attributes.TIP);
+    labelAttribute = getAttribute(Attributes.LABEL);
+    markupAttribute = getAttribute(Attributes.MARKUP);
   }
 
   protected abstract String getSubComponentType();
@@ -131,13 +132,13 @@
     UILabel label = (UILabel) application.createComponent(UILabel.COMPONENT_TYPE);
     label.setRendererType(TobagoConstants.RENDERER_TYPE_LABEL);
     label.setId(uid);
-    label.getAttributes().put(TobagoConstants.ATTR_FOR, "@auto");
+    label.getAttributes().put(Attributes.FOR, "@auto");
     if (tipAttribute != null) {
       if (tipAttribute.isLiteral()) {
         label.setTip(tipAttribute.getValue(faceletContext));
       } else {
         ValueExpression expression = tipAttribute.getValueExpression(faceletContext, String.class);
-        ELAdaptor.setExpression(label, TobagoConstants.ATTR_TIP, expression);
+        ELAdaptor.setExpression(label, Attributes.TIP, expression);
       }
     }
     if (labelAttribute != null) {
@@ -145,7 +146,7 @@
         label.setValue(labelAttribute.getValue(faceletContext));
       } else {
         ValueExpression expression = labelAttribute.getValueExpression(faceletContext, String.class);
-        ELAdaptor.setExpression(label, TobagoConstants.ATTR_VALUE, expression);
+        ELAdaptor.setExpression(label, Attributes.VALUE, expression);
       }
     }
     if (markupAttribute != null) {
@@ -153,7 +154,7 @@
         ComponentUtil.setMarkup(label, markupAttribute.getValue());
       } else {
         ValueExpression expression = markupAttribute.getValueExpression(faceletContext, Object.class);
-        ELAdaptor.setExpression(label, TobagoConstants.ATTR_MARKUP, expression);
+        ELAdaptor.setExpression(label, Attributes.MARKUP, expression);
       }
     }
     panel.getChildren().add(label);
@@ -204,8 +205,8 @@
       }
       return metaRuleset;
     } else {
-      metaRuleset.ignore(TobagoConstants.ATTR_LABEL);
-      metaRuleset.ignore(TobagoConstants.ATTR_TIP);
+      metaRuleset.ignore(Attributes.LABEL);
+      metaRuleset.ignore(Attributes.TIP);
       metaRuleset.ignore("labelWidth");
     }
     if (SupportsMarkup.class.isAssignableFrom(aClass)) {

Modified: myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java (original)
+++ myfaces/tobago/trunk/extension/facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoMenuExtensionHandler.java Fri Oct 24 12:16:37 2008
@@ -23,7 +23,7 @@
 import com.sun.facelets.tag.jsf.ComponentConfig;
 import com.sun.facelets.tag.jsf.ComponentHandler;
 import com.sun.facelets.tag.jsf.ComponentSupport;
-import org.apache.myfaces.tobago.TobagoConstants;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.UIMenuCommand;
 
@@ -73,15 +73,15 @@
   protected MetaRuleset createMetaRuleset(Class aClass) {
     MetaRuleset metaRuleset = super.createMetaRuleset(aClass);
     if (UIMenuCommand.class.isAssignableFrom(aClass)) {
-      metaRuleset.ignore(TobagoConstants.ATTR_CONVERTER);
-      metaRuleset.ignore(TobagoConstants.ATTR_VALUE);
+      metaRuleset.ignore(Attributes.CONVERTER);
+      metaRuleset.ignore(Attributes.VALUE);
       return metaRuleset;
     } else {
       TagAttribute [] attrs = tag.getAttributes().getAll();
       for (int i = 0; i < attrs.length; i++) {
         TagAttribute attr = attrs[i];
-        if (!(attr.getLocalName().equals(TobagoConstants.ATTR_CONVERTER)
-            || attr.getLocalName().equals(TobagoConstants.ATTR_VALUE))) {
+        if (!(attr.getLocalName().equals(Attributes.CONVERTER)
+            || attr.getLocalName().equals(Attributes.VALUE))) {
           metaRuleset.ignore(attr.getLocalName());
         }
       }

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/BoxRenderer.java Fri Oct 24 12:16:37 2008
@@ -17,7 +17,7 @@
  * limitations under the License.
  */
 
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_LABEL;
+import org.apache.myfaces.tobago.component.Attributes;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
@@ -59,7 +59,7 @@
     FoUtils.writeBorder(writer, borderWidth);
     FoUtils.layoutBlockContainer(writer, height, width, x, y);
     //writer.writeAttribute("padding", Layout.getMM(padding), null);
-    String labelString = (String) component.getAttributes().get(ATTR_LABEL);
+    String labelString = (String) component.getAttributes().get(Attributes.LABEL);
     FoUtils.writeTextBlockAlignStart(writer, component, labelString);
     // TODO UIComponent label = component.getFacet(Facets.LABEL);
     FoUtils.endBlockContainer(writer);

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/fo/standard/standard/tag/PanelRenderer.java Fri Oct 24 12:16:37 2008
@@ -17,8 +17,6 @@
  * limitations under the License.
  */
 
-//import static org.apache.myfaces.tobago.TobagoConstants.ATTR_BODY_CONTENT;
-
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import java.io.IOException;

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/InputNumberSliderRenderer.java Fri Oct 24 12:16:37 2008
@@ -18,10 +18,7 @@
  */
 
 import org.apache.myfaces.tobago.TobagoConstants;
-import org.apache.myfaces.tobago.util.ComponentUtil;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_DISABLED;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_READONLY;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_STYLE;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.config.ThemeConfig;
 import org.apache.myfaces.tobago.context.ResourceManager;
 import org.apache.myfaces.tobago.context.ResourceManagerFactory;
@@ -29,9 +26,10 @@
 import org.apache.myfaces.tobago.renderkit.LayoutableRendererBase;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlConstants;
-import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
 import org.apache.myfaces.tobago.renderkit.html.HtmlStyleMap;
 import org.apache.myfaces.tobago.renderkit.html.StyleClasses;
+import org.apache.myfaces.tobago.renderkit.html.util.HtmlRendererUtil;
+import org.apache.myfaces.tobago.util.ComponentUtil;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -57,14 +55,14 @@
 
     String id = component.getClientId(facesContext);
     String currentValue = getCurrentValue(facesContext, component);
-    boolean readonly = ComponentUtil.getBooleanAttribute(component, ATTR_READONLY);
-    boolean disabled = ComponentUtil.getBooleanAttribute(component, ATTR_DISABLED);
+    boolean readonly = ComponentUtil.getBooleanAttribute(component, Attributes.READONLY);
+    boolean disabled = ComponentUtil.getBooleanAttribute(component, Attributes.DISABLED);
     Integer min = ComponentUtil.getIntAttribute(component, "min");
     Integer max = ComponentUtil.getIntAttribute(component, "max");
     TobagoResponseWriter writer = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
 
 
-    HtmlStyleMap style = (HtmlStyleMap) component.getAttributes().get(ATTR_STYLE);
+    HtmlStyleMap style = (HtmlStyleMap) component.getAttributes().get(Attributes.STYLE);
     int width = -1;
     int sliderWidthPerc = 33;
     if (ThemeConfig.hasValue(facesContext, component, SLIDER_WIDTH_PERCENT)) {
@@ -137,7 +135,7 @@
     }
     writer.writeAttribute(HtmlAttributes.READONLY, readonly);
     writer.writeAttribute(HtmlAttributes.DISABLED, disabled);
-    //writer.writeAttribute(HtmlAttributes.STYLE, null, ATTR_STYLE);
+    //writer.writeAttribute(HtmlAttributes.STYLE, null, STYLE);
     writer.endElement(HtmlConstants.INPUT);
     writer.endElement(HtmlConstants.TD);
 

Modified: myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java?rev=707725&r1=707724&r2=707725&view=diff
==============================================================================
--- myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/wml/standard/standard/tag/BoxRenderer.java Fri Oct 24 12:16:37 2008
@@ -45,7 +45,7 @@
     //  = HtmlRendererUtil.getTobagoResponseWriter(facesContext);
 
     //BodyContentHandler bodyContentHandler = (BodyContentHandler)
-    //    panel.getAttributes().get(ATTR_BODY_CONTENT);
+    //    panel.getAttributes().get(BODY_CONTENT);
 
     //writer.write(bodyContentHandler.getBodyContent());
     // </card> ?



Mime
View raw message