incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sless...@apache.org
Subject svn commit: r448427 [3/3] - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal: renderkit/core/desktop/ renderkit/core/pda/ renderkit/core/skin/ renderkit/core/xhtml/ renderkit/core/xhtml/table/ render...
Date Thu, 21 Sep 2006 01:41:36 GMT
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableNavRenderer.java
Wed Sep 20 18:41:33 2006
@@ -24,9 +24,9 @@
 import org.apache.myfaces.trinidad.bean.FacesBean;
 import org.apache.myfaces.trinidad.component.UIXTreeTable;
 import org.apache.myfaces.trinidad.component.core.data.CoreTreeTable;
-
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
 import org.apache.myfaces.trinidadinternal.share.util.FastMessageFormat;
@@ -228,11 +228,11 @@
     final String styleClass;
     if (disabled)
     {
-      styleClass = XhtmlConstants.HGRID_NAV_ROW_ILINK_STYLE_CLASS;
+      styleClass = SkinSelectors.HGRID_NAV_ROW_ILINK_STYLE_CLASS;
     }
     else
     {
-      styleClass = XhtmlConstants.HGRID_NAV_ROW_ALINK_STYLE_CLASS;
+      styleClass = SkinSelectors.HGRID_NAV_ROW_ALINK_STYLE_CLASS;
       writer.writeAttribute(XhtmlConstants.HREF_ATTRIBUTE, "#", null);
       writer.writeAttribute(XhtmlConstants.ONCLICK_ATTRIBUTE, onclick, null);
       String shortDesc = 
@@ -259,14 +259,14 @@
     if (isTop)
     {
       iconKey = isDisabled
-        ? XhtmlConstants.AF_TREE_TABLE_DISABLED_NAV_UP_ICON_NAME
-        : XhtmlConstants.AF_TREE_TABLE_NAV_UP_ICON_NAME;
+        ? SkinSelectors.AF_TREE_TABLE_DISABLED_NAV_UP_ICON_NAME
+        : SkinSelectors.AF_TREE_TABLE_NAV_UP_ICON_NAME;
     }
     else
     {
       iconKey = isDisabled
-        ? XhtmlConstants.AF_TREE_TABLE_DISABLED_NAV_DOWN_ICON_NAME
-        : XhtmlConstants.AF_TREE_TABLE_NAV_DOWN_ICON_NAME;
+        ? SkinSelectors.AF_TREE_TABLE_DISABLED_NAV_DOWN_ICON_NAME
+        : SkinSelectors.AF_TREE_TABLE_NAV_DOWN_ICON_NAME;
     }
     
     return arc.getIcon(iconKey);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeTableRenderingContext.java
Wed Sep 20 18:41:33 2006
@@ -18,13 +18,13 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.component.UIXColumn;
 import org.apache.myfaces.trinidad.component.UIXTree;
 import org.apache.myfaces.trinidad.component.UIXTreeTable;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinProperties;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
 
 /**
@@ -72,7 +72,7 @@
     _crumbs = TreeUtils.getFocusRowKey(_hGridBase);
 
     Number spacerWidth = (Number)
-      arc.getSkin().getProperty(XhtmlConstants.AF_TREE_TABLE_SPACER_WIDTH);
+      arc.getSkin().getProperty(SkinProperties.AF_TREE_TABLE_SPACER_WIDTH);
     if (spacerWidth != null)
     {
       _spacerWidth = spacerWidth.intValue();

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/table/TreeUtils.java
Wed Sep 20 18:41:33 2006
@@ -23,19 +23,18 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.event.FacesEvent;
 
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
 import org.apache.myfaces.trinidad.component.UIXNavigationTree;
 import org.apache.myfaces.trinidad.component.UIXPage;
 import org.apache.myfaces.trinidad.component.UIXTree;
 import org.apache.myfaces.trinidad.component.UIXTreeTable;
-import org.apache.myfaces.trinidad.event.RowDisclosureEvent;
 import org.apache.myfaces.trinidad.event.FocusEvent;
-
+import org.apache.myfaces.trinidad.event.RowDisclosureEvent;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.model.RowKeySet;
-
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.HiddenLabelUtils;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.TableRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
@@ -82,7 +81,7 @@
 
     if (HiddenLabelUtils.supportsHiddenLabels(arc))
       XhtmlRenderer.renderStyleClass(context, arc,
-                         XhtmlConstants.HIDDEN_LABEL_STYLE_CLASS);
+                         SkinSelectors.HIDDEN_LABEL_STYLE_CLASS);
 
     writer.writeText(levelInfo, null);
     writer.endElement("label");

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelAccordionRenderer.java
Wed Sep 20 18:41:33 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.html.layout;
 
 import java.io.IOException;
-
 import java.util.List;
 import java.util.ListIterator;
 
@@ -24,15 +23,14 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.component.UIXShowDetail;
-
-import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.desktop.HideShowUtils;
 import org.apache.myfaces.trinidadinternal.ui.partial.PartialPageRendererUtils;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
@@ -358,37 +356,37 @@
 
   String getContainerStyleClass()
   {
-    return XhtmlConstants.AF_PANELACCORDION_CONTAINER_STYLE_CLASS;
+    return SkinSelectors.AF_PANELACCORDION_CONTAINER_STYLE_CLASS;
   }
 
   String getContentStyleClass()
   {
-    return XhtmlConstants.AF_PANELACCORDION_CONTENT_STYLE_CLASS;
+    return SkinSelectors.AF_PANELACCORDION_CONTENT_STYLE_CLASS;
   }
 
   String getHeaderDisabledStyleClass()
   {
-    return XhtmlConstants.AF_PANELACCORDION_HEADER_DISABLED_STYLE_CLASS;
+    return SkinSelectors.AF_PANELACCORDION_HEADER_DISABLED_STYLE_CLASS;
   }
 
   String getHeaderExpanedStyleClass()
   {
-    return XhtmlConstants.AF_PANELACCORDION_HEADER_EXPANDED_STYLE_CLASS;
+    return SkinSelectors.AF_PANELACCORDION_HEADER_EXPANDED_STYLE_CLASS;
   }
 
   String getHeaderCollapsedStyleClass()
   {
-    return XhtmlConstants.AF_PANELACCORDION_HEADER_COLLAPSED_STYLE_CLASS;
+    return SkinSelectors.AF_PANELACCORDION_HEADER_COLLAPSED_STYLE_CLASS;
   }
 
   String getLinkDisabledStyleClass()
   {
-    return XhtmlConstants.AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS;
+    return SkinSelectors.AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS;
   }
 
   String getLinkEnabledStyleClass()
   {
-    return XhtmlConstants.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS;
+    return SkinSelectors.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS;
   }
 
   String getDisclosedTipKey()

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelRadioRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelRadioRenderer.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelRadioRenderer.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/CorePanelRadioRenderer.java
Wed Sep 20 18:41:33 2006
@@ -16,21 +16,19 @@
 package org.apache.myfaces.trinidadinternal.renderkit.html.layout;
 
 import java.io.IOException;
-
 import java.util.ListIterator;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.component.UIXShowDetail;
-
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafRenderer;
 
@@ -85,7 +83,7 @@
 
     XhtmlLafRenderer.
       renderStyleClassAttribute(rCtx,
-                                XhtmlConstants.AF_LABEL_TEXT_STYLE_CLASS);
+                                SkinSelectors.AF_LABEL_TEXT_STYLE_CLASS);
 
     out.writeText(encoder.encodeParameter(label), null);
 
@@ -225,7 +223,7 @@
       String radioSpanClass = getFieldTextClass();
       if (disabled)
       {
-        radioSpanClass = XhtmlConstants.AF_FIELD_TEXT_DISABLED_STYLE_CLASS;
+        radioSpanClass = SkinSelectors.AF_FIELD_TEXT_DISABLED_STYLE_CLASS;
       }
       XhtmlLafRenderer.renderStyleClassAttribute(rCtx,
                                                  radioSpanClass);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/html/layout/ShowOneListRendererBase.java
Wed Sep 20 18:41:33 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.renderkit.html.layout;
 
 import java.io.IOException;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.ListIterator;
@@ -26,16 +25,15 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.component.UIXShowDetail;
-
-import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderUtils;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafRenderer;
 import org.apache.myfaces.trinidadinternal.uinode.UINodeRendererBase;
 
@@ -388,7 +386,7 @@
           out.startElement ("span", null);
           XhtmlRenderer.renderStyleClass (FacesContext.getCurrentInstance(),
                                           RenderingContext.getCurrentInstance(),  
-                                          XhtmlConstants.AF_ACCESSKEY_STYLE_CLASS);
+                                          SkinSelectors.AF_ACCESSKEY_STYLE_CLASS);
           out.writeText (accessChar.toString(), null);
           out.endElement ("span");
           
@@ -427,7 +425,7 @@
    */
   protected String getFieldTextClass()
   {
-    return XhtmlConstants.AF_FIELD_TEXT_STYLE_CLASS;
+    return SkinSelectors.AF_FIELD_TEXT_STYLE_CLASS;
   }
 
   /**
@@ -455,7 +453,7 @@
    */
   private String getLabelClassName()
   {
-    return XhtmlConstants.AF_LABEL_TEXT_STYLE_CLASS;
+    return SkinSelectors.AF_LABEL_TEXT_STYLE_CLASS;
   }
 
   /**

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/skin/Skin.java
Wed Sep 20 18:41:33 2006
@@ -15,29 +15,25 @@
  */
 package org.apache.myfaces.trinidadinternal.skin;
 
-import java.util.HashMap;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.MissingResourceException;
-
 import java.util.Stack;
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinProperties;
 import org.apache.myfaces.trinidadinternal.share.expl.Coercions;
+import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
+import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
 import org.apache.myfaces.trinidadinternal.skin.icon.ReferenceIcon;
-import org.apache.myfaces.trinidadinternal.ui.laf.xml.parse.IconNode;
-import org.apache.myfaces.trinidadinternal.ui.laf.xml.parse.SkinPropertyNode;
-import org.apache.myfaces.trinidadinternal.util.OptimisticHashMap;
-
 import org.apache.myfaces.trinidadinternal.style.StyleContext;
 import org.apache.myfaces.trinidadinternal.style.xml.StyleSheetDocumentUtils;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.StyleSheetDocument;
-
-import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
-
-import org.apache.myfaces.trinidadinternal.skin.icon.Icon;
+import org.apache.myfaces.trinidadinternal.ui.laf.xml.parse.IconNode;
+import org.apache.myfaces.trinidadinternal.ui.laf.xml.parse.SkinPropertyNode;
+import org.apache.myfaces.trinidadinternal.util.OptimisticHashMap;
 
 
 
@@ -594,11 +590,11 @@
     _PROPERTY_CLASS_TYPE_MAP = new HashMap<String, Class<?>>();
     
     _PROPERTY_CLASS_TYPE_MAP.put(
-      XhtmlConstants.AF_NAVIGATIONPATH_SHOW_LAST_ITEM_PROPERTY_KEY, Boolean.class);
+      SkinProperties.AF_NAVIGATIONPATH_SHOW_LAST_ITEM_PROPERTY_KEY, Boolean.class);
     _PROPERTY_CLASS_TYPE_MAP.put(
-      XhtmlConstants.AF_TABLE_SELECTION_BAR_IN_TABLE, Boolean.class);
+      SkinProperties.AF_TABLE_SELECTION_BAR_IN_TABLE, Boolean.class);
     _PROPERTY_CLASS_TYPE_MAP.put(
-      XhtmlConstants.AF_TABLE_REPEAT_CONTROL_BAR, Boolean.class);
+      SkinProperties.AF_TABLE_REPEAT_CONTROL_BAR, Boolean.class);
   }
 
   // Error messages

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/cache/FileSystemStyleCache.java
Wed Sep 20 18:41:33 2006
@@ -24,32 +24,24 @@
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.util.Collection;
-import java.util.Map;
 import java.util.HashMap;
 import java.util.Hashtable;
-
 import java.util.Iterator;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.Vector;
 
-import org.xml.sax.SAXException;
-
-
-import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
-
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
-import org.apache.myfaces.trinidadinternal.share.io.DefaultNameResolver;
-import org.apache.myfaces.trinidadinternal.share.io.NameResolver;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.share.io.CachingNameResolver;
+import org.apache.myfaces.trinidadinternal.share.io.DefaultNameResolver;
 import org.apache.myfaces.trinidadinternal.share.io.InputStreamProvider;
+import org.apache.myfaces.trinidadinternal.share.io.NameResolver;
 import org.apache.myfaces.trinidadinternal.share.nls.LocaleContext;
 import org.apache.myfaces.trinidadinternal.share.xml.JaxpXMLProvider;
 import org.apache.myfaces.trinidadinternal.share.xml.XMLProvider;
-
 import org.apache.myfaces.trinidadinternal.style.CSSStyle;
 import org.apache.myfaces.trinidadinternal.style.Style;
 import org.apache.myfaces.trinidadinternal.style.StyleContext;
@@ -63,6 +55,8 @@
 import org.apache.myfaces.trinidadinternal.style.xml.parse.StyleNode;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.StyleSheetDocument;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.StyleSheetNode;
+import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
+import org.xml.sax.SAXException;
 
 /**
  * The FileSystemStyleCache is a StyleProvider implementation which
@@ -1532,24 +1526,24 @@
                  "af|chooseDate::content A");
 
     _STYLE_KEY_MAP.put(
-        XhtmlConstants.AF_SHOWMANYACCORDION_TITLE_LINK_STYLE_CLASS,
+        SkinSelectors.AF_SHOWMANYACCORDION_TITLE_LINK_STYLE_CLASS,
         "A.af|showManyAccordion::title-link");
     _STYLE_KEY_MAP.put(
-        XhtmlConstants.AF_SHOWMANYACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS,
+        SkinSelectors.AF_SHOWMANYACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS,
         "A.af|showManyAccordion::title-disabled-link");
 
     _STYLE_KEY_MAP.put(
-        XhtmlConstants.AF_SHOWONEACCORDION_TITLE_LINK_STYLE_CLASS,
+        SkinSelectors.AF_SHOWONEACCORDION_TITLE_LINK_STYLE_CLASS,
         "A.af|showOneAccordion::title-link");
     _STYLE_KEY_MAP.put(
-        XhtmlConstants.AF_SHOWONEACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS,
+        SkinSelectors.AF_SHOWONEACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS,
         "A.af|showOneAccordion::title-disabled-link");
 
     _STYLE_KEY_MAP.put(
-        XhtmlConstants.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS,
+        SkinSelectors.AF_PANELACCORDION_TITLE_LINK_STYLE_CLASS,
         "A.af|panelAccordion::title-link");
     _STYLE_KEY_MAP.put(
-        XhtmlConstants.AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS,
+        SkinSelectors.AF_PANELACCORDION_TITLE_LINK_DISABLED_STYLE_CLASS,
         "A.af|panelAccordion::title-disabled-link");
 
     _STYLE_KEY_MAP.put("af|panelTabbed::tab-link",

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ButtonRenderer.java
Wed Sep 20 18:41:33 2006
@@ -16,9 +16,7 @@
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
 
 import java.awt.Color;
-
 import java.io.IOException;
-
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -31,16 +29,16 @@
 import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
 import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
 import org.apache.myfaces.trinidadinternal.image.cache.CompositeButtonKey;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.style.Style;
 import org.apache.myfaces.trinidadinternal.style.util.CSSUtils;
 import org.apache.myfaces.trinidadinternal.style.util.FontProxy;
 import org.apache.myfaces.trinidadinternal.style.util.MutableFontProxy;
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 import org.apache.myfaces.trinidadinternal.ui.Renderer;
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientActionUtils;
 import org.apache.myfaces.trinidadinternal.ui.action.FireAction;
@@ -657,7 +655,7 @@
              renderButtonAccessKey(context, node);
           }
           renderAccessKeyText(context, node, text, 
-                              XhtmlConstants.AF_LINKACCESSKEY_STYLE_CLASS);
+                              SkinSelectors.AF_LINKACCESSKEY_STYLE_CLASS);
         }
         else
         {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ButtonRenderer.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ButtonRenderer.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ButtonRenderer.java
Wed Sep 20 18:41:33 2006
@@ -19,14 +19,13 @@
 
 import javax.faces.component.UIComponent;
 
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
-
-import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientActionUtils;
+import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
 
 
 /**
@@ -224,7 +223,7 @@
       if (supportsAdvancedButtons(context))
       {
         renderAccessKeyText(context, node, getText(context, node), 
-                            XhtmlConstants.AF_ACCESSKEY_STYLE_CLASS);
+                            SkinSelectors.AF_ACCESSKEY_STYLE_CLASS);
       }
     }
     else

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkRenderer.java
Wed Sep 20 18:41:33 2006
@@ -22,10 +22,10 @@
 
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.CoreRenderingContext;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.share.url.URLEncoder;
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientAction;
 import org.apache.myfaces.trinidadinternal.ui.action.ClientActionUtils;
 import org.apache.myfaces.trinidadinternal.ui.action.FireAction;
@@ -479,7 +479,7 @@
     {
 
       renderAccessKeyText(context, node, getText(context, node), 
-                          XhtmlConstants.AF_LINKACCESSKEY_STYLE_CLASS);
+                          SkinSelectors.AF_LINKACCESSKEY_STYLE_CLASS);
     }
     else
     {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/StyledTextRenderer.java
Wed Sep 20 18:41:33 2006
@@ -20,13 +20,10 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.component.UIXValue;
-
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UINode;
-
-
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
+import org.apache.myfaces.trinidadinternal.ui.UINode;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 
 /**
@@ -123,7 +120,7 @@
         renderAccessKeyText(context,
                             textValue,
                             keyIndex,
-                            XhtmlConstants.AF_ACCESSKEY_STYLE_CLASS);
+                            SkinSelectors.AF_ACCESSKEY_STYLE_CLASS);
       }
       else
       {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java?view=diff&rev=448427&r1=448426&r2=448427
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafRenderer.java
Wed Sep 20 18:41:33 2006
@@ -16,45 +16,40 @@
 package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
 
 import java.io.IOException;
-
 import java.util.Iterator;
 
 import javax.faces.component.UIComponent;
 import javax.faces.context.ResponseWriter;
-
 import javax.faces.convert.Converter;
 import javax.faces.validator.Validator;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.image.ImageConstants;
 import org.apache.myfaces.trinidadinternal.image.ImageContext;
 import org.apache.myfaces.trinidadinternal.image.ImageProvider;
 import org.apache.myfaces.trinidadinternal.image.ImageProviderRequest;
 import org.apache.myfaces.trinidadinternal.image.ImageProviderResponse;
-import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.ppr.PartialPageContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
-import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlConstants;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.SkinSelectors;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlRenderer;
 import org.apache.myfaces.trinidadinternal.style.Style;
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 import org.apache.myfaces.trinidadinternal.ui.NodeRole;
 import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafRenderer;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.IconURIBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.LafIconProvider;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.NodeRoleUtils;
 import org.apache.myfaces.trinidadinternal.ui.partial.PartialPageRendererUtils;
-
 import org.apache.myfaces.trinidadinternal.util.FormattedTextParser;
+import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 
 /**
@@ -2028,7 +2023,7 @@
       {
         // hightlight any access keys with an underline
         renderAccessKeyText(context, node, textValue, 
-                            XhtmlConstants.AF_ACCESSKEY_STYLE_CLASS);
+                            SkinSelectors.AF_ACCESSKEY_STYLE_CLASS);
       }
       else
       {



Mime
View raw message