incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jwald...@apache.org
Subject svn commit: r524926 - in /incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml: ./ parse/
Date Mon, 02 Apr 2007 21:21:43 GMT
Author: jwaldman
Date: Mon Apr  2 14:21:42 2007
New Revision: 524926

URL: http://svn.apache.org/viewvc?view=rev&rev=524926
Log:
delete unused parsers in org.apache.myfaces.trinidadinternal.ui.laf.xml.parse
Deleted colorProperty and colorScheme. Both have been deprecated for years, and are not being
used in our XSS.
This cleans up our skinning code some.

Removed:
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/ColorPropertyNode.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/ColorSchemeNode.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/ColorSchemeNodeParser.java
Modified:
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/XMLConstants.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java
    incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java?view=diff&rev=524926&r1=524925&r2=524926
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/StyleSheetDocumentUtils.java
Mon Apr  2 14:21:42 2007
@@ -41,7 +41,6 @@
 
 import org.apache.myfaces.trinidadinternal.style.StyleConstants;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.ColorNode;
-import org.apache.myfaces.trinidadinternal.style.xml.parse.ColorSchemeNode;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.IncludePropertyNode;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.PropertyNode;
 import org.apache.myfaces.trinidadinternal.style.xml.parse.StyleNode;
@@ -156,8 +155,6 @@
     StyleSheetNode[] styleSheetsArray = new StyleSheetNode[styleSheetsCount];
     styleSheetsList.toArray(styleSheetsArray);
 
-    // We are blowing off ColorSchemes (which should already be
-    // obsolete anyway) - so we are ready to create the new document.
     return new StyleSheetDocument(styleSheetsArray,
                                   documentVersion,
                                   documentTimestamp);
@@ -206,7 +203,6 @@
       _registerFactory(manager, StyleNode.class, "StyleNode");
       _registerFactory(manager, PropertyNode.class, "PropertyNode");
       _registerFactory(manager, ColorNode.class, "ColorNode");
-      _registerFactory(manager, ColorSchemeNode.class, "ColorSchemeNode");
       _registerFactory(manager,
                        IncludePropertyNode.class,
                        "IncludePropertyNode");

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/XMLConstants.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/XMLConstants.java?view=diff&rev=524926&r1=524925&r2=524926
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/XMLConstants.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/XMLConstants.java
Mon Apr  2 14:21:42 2007
@@ -26,8 +26,6 @@
 {
   // Element names
   public static final String COLOR_NAME          = "color";
-  public static final String COLOR_PROPERTY_NAME = "colorProperty";
-  public static final String COLOR_SCHEME_NAME   = "colorScheme";
   public static final String IMPORT_NAME         = "import";
   public static final String INCLUDE_STYLE_NAME  = "includeStyle";
   public static final String INCLUDE_PROPERTY_NAME  = "includeProperty";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java?view=diff&rev=524926&r1=524925&r2=524926
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNode.java
Mon Apr  2 14:21:42 2007
@@ -48,12 +48,6 @@
     return _value;
   }
 
-  // Package-level accessor necessary to support deprecated color properties
-  boolean __isColorProperty()
-  {
-    return false;
-  }
-
   private String _name;
   private String _value;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java?view=diff&rev=524926&r1=524925&r2=524926
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/PropertyNodeParser.java
Mon Apr  2 14:21:42 2007
@@ -6,9 +6,9 @@
  *  to you under the Apache License, Version 2.0 (the
  *  "License"); you may not use this file except in compliance
  *  with the License.  You may obtain a copy of the License at
- * 
+ *
  *  http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  *  Unless required by applicable law or agreed to in writing,
  *  software distributed under the License is distributed on an
  *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -56,8 +56,6 @@
   {
     _name = getRequiredAttribute(context, attrs, NAME_ATTR);
 
-    if (XMLConstants.COLOR_PROPERTY_NAME.equals(localName))
-      _LOG.warning(_DEPRECATED_ERROR);
   }
 
   /**
@@ -83,8 +81,6 @@
       }
       return new PropertyNode(_name, _value);
     }
-    if (localName.equals(COLOR_PROPERTY_NAME))
-      return new ColorPropertyNode(_name, _value);
 
     return null;
   }
@@ -150,8 +146,6 @@
   private String _value;
   private String _whitespace;
 
-  private static final String _DEPRECATED_ERROR =
-    "The <colorProperty> element is deprecated.  Colors must be explicitly specified
using <property> elements.";
 
   // PropertyValidater instances, hashed by property name
   private static final Object[] _VALIDATERS =

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java?view=diff&rev=524926&r1=524925&r2=524926
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNode.java
Mon Apr  2 14:21:42 2007
@@ -33,20 +33,6 @@
  */
 public class StyleNode
 {
-  // A private constructor that we are temporarily using while
-  // resolving the now-deprecated color properties
-  StyleNode(
-    StyleNode style,
-    PropertyNode[] properties
-    )
-  {
-    this(style._name,
-         style._selector,
-         properties,
-         style._includedStyles,
-         style._includedProperties,
-         null);
-  }
 
   /**
    * Creates a Style with the specified properties

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java?view=diff&rev=524926&r1=524925&r2=524926
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleNodeParser.java
Mon Apr  2 14:21:42 2007
@@ -116,10 +116,9 @@
     Attributes   attrs
     )
   {
-    // Delegate property/color property nodes to the appropriate parser
+    // Delegate property nodes to the appropriate parser
     // We handle included styles ourself
-    if (localName.equals(PROPERTY_NAME) ||
-        localName.equals(COLOR_PROPERTY_NAME))
+    if (localName.equals(PROPERTY_NAME))
     {
       return context.getParser(PropertyNode.class, namespaceURI, localName);
     }
@@ -165,8 +164,7 @@
     Object       child
     )
   {
-    if (localName.equals(PROPERTY_NAME)       ||
-        localName.equals(COLOR_PROPERTY_NAME))
+    if (localName.equals(PROPERTY_NAME))
     {
       if (child != null)
       {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java?view=diff&rev=524926&r1=524925&r2=524926
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocument.java
Mon Apr  2 14:21:42 2007
@@ -63,12 +63,10 @@
 
   /**
    * Creates a StyleSheetDocument
-   * @deprecated colorScheme elements are no longer supported
    */
   @Deprecated
   public StyleSheetDocument(
-    StyleSheetNode[] styleSheets,
-    ColorSchemeNode[] colorSchemes
+    StyleSheetNode[] styleSheets
     )
   {
     this (styleSheets, null, UNKNOWN_TIMESTAMP);
@@ -76,12 +74,10 @@
 
   /**
    * Creates a StyleSheetDocument
-   * @deprecated colorScheme elements are no longer supported
    */
   @Deprecated
   public StyleSheetDocument(
     StyleSheetNode[] styleSheets,
-    ColorSchemeNode[] colorSchemes,
     String documentVersion
     )
   {
@@ -150,16 +146,6 @@
     {
       return (Arrays.asList(_styleSheets)).iterator();
     }
-  }
-
-  /**
-   * Implementation of StyleSheetDocument.getColorSchemes();
-   */
-  public Iterator<ColorSchemeNode> getColorSchemes()
-  {
-    // -= Simon Lessard =- 
-    // TODO: Wouldn't Collections.emptyList() be better?
-    return (Arrays.asList(new ColorSchemeNode[0])).iterator();
   }
 
   /**

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java?view=diff&rev=524926&r1=524925&r2=524926
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetDocumentParser.java
Mon Apr  2 14:21:42 2007
@@ -94,12 +94,9 @@
     )
   {
     StyleSheetNode[] styleSheets = _getStyleSheets();
-    ColorSchemeNode[] colorSchemes = _getColorSchemes();
     String documentVersion = _getDocumentVersion();
     long documentTimestamp = _getDocumentTimestamp(context);
 
-    styleSheets = _resolveColorProperties(styleSheets, colorSchemes);
-
     return new StyleSheetDocument(styleSheets,
                                   documentVersion,
                                   documentTimestamp);
@@ -124,14 +121,6 @@
         localName
         );
     }
-    else if (localName.equals(COLOR_SCHEME_NAME))
-    {
-      return context.getParser(
-        ColorSchemeNode.class,
-        namespaceURI,
-        localName
-        );
-    }
     else if (localName.equals(IMPORT_NAME))
     {
       String href = attrs.getValue(HREF_ATTR);
@@ -171,13 +160,6 @@
 
         _styleSheets.addElement((StyleSheetNode)child);
       }
-      else if (localName.equals(COLOR_SCHEME_NAME))
-      {
-        if (_colorSchemes == null)
-          _colorSchemes = new Vector<ColorSchemeNode>();
-
-        _colorSchemes.addElement((ColorSchemeNode)child);
-      }
     }
   }
 
@@ -225,105 +207,6 @@
     return styleSheets;
   }
 
-  // Return a list of color schemes defined in this document and
-  // imported documents.  We merge color scheme nodes with the same
-  // namespace/name now, because we can.
-  private ColorSchemeNode[] _getColorSchemes()
-  {
-    // We collect ColorSchemeNodes in a dictionary (hashed by namespaceURI +
-    // name) to simplify merging
-    // -= Simon Lessard =-
-    // TODO: Check if synchronization is really needed.
-    Hashtable<String, ColorSchemeNode> colorSchemesTable = 
-      new Hashtable<String, ColorSchemeNode>(19);
-
-    // Merge in imported color schemes first
-    if (_imports != null)
-    {
-      for(StyleSheetDocument doc : _imports)
-      {
-        Iterator<ColorSchemeNode> e = doc.getColorSchemes();
-        while (e.hasNext())
-        {
-          _mergeColorScheme(colorSchemesTable, e.next());
-        }
-      }
-    }
-
-    // Merge in color schemes defined by this document
-    if (_colorSchemes != null)
-    {
-      for (int i = 0; i < _colorSchemes.size(); i++)
-      {
-        _mergeColorScheme(colorSchemesTable, _colorSchemes.elementAt(i));
-      }
-    }
-
-    // Now, copy everything into a single array
-    int count = colorSchemesTable.size();
-    ColorSchemeNode[] colorSchemes = new ColorSchemeNode[count];
-    int i = 0;
-    for(ColorSchemeNode node : colorSchemesTable.values())
-    {
-      colorSchemes[i++] = node;
-    }
-
-    return colorSchemes;
-  }
-
-  // Merges the ColorSchemeNode into a Map of ColorSchemeNodes, hashed
-  // by namespaceURI + name.
-  private void _mergeColorScheme(
-    Map<String, ColorSchemeNode> colorSchemes,
-    ColorSchemeNode colorScheme
-    )
-  {
-    String key = colorScheme.getNamespaceURI() + colorScheme.getName();
-    ColorSchemeNode oldColorScheme = colorSchemes.get(key);
-
-    if (oldColorScheme == null)
-    {
-      colorSchemes.put(key, colorScheme);
-      return;
-    }
-
-    // If we've already got a color scheme, we need to merge the colors
-    // from the new and old color schemes.  Brute force method here...
-    // -= Simon Lessard =-
-    // TODO: Check if synchronization is truly required.
-    Hashtable<String, ColorNode> colorsTable = new Hashtable<String, ColorNode>();
-
-    // First, merge in the old colors
-    Iterator<ColorNode> e = oldColorScheme.getColors();
-    while (e.hasNext())
-    {
-      ColorNode color = e.next();
-      colorsTable.put(color.getName(), color);
-    }
-
-    // Now, overwrite with new colors
-    e = colorScheme.getColors();
-    while (e.hasNext())
-    {
-      ColorNode color = e.next();
-      colorsTable.put(color.getName(), color);
-    }
-
-    // Now, create the merged ColorSchemeNode
-    ColorNode[] colors = new ColorNode[colorsTable.size()];
-    int i = 0;
-    for(ColorNode color : colorsTable.values())
-    {
-      colors[i++] = color;
-    }
-
-    ColorSchemeNode newColorScheme = new ColorSchemeNode(
-                                           colorScheme.getNamespaceURI(),
-                                           colorScheme.getName(),
-                                           colors);
-
-    colorSchemes.put(key, newColorScheme);
-  }
 
   // Handle an import - parse the imported XSS document
   private void _handleImport(
@@ -360,110 +243,7 @@
     }
   }
 
-  /**
-   * Converts any color property nodes into normal property nodes
-   */
-  private StyleSheetNode[] _resolveColorProperties(
-    StyleSheetNode[]  styleSheets,
-    ColorSchemeNode[] colorSchemes
-    )
-  {
-    if (styleSheets == null)
-      return null;
-
-    // If we are the top level document, resolve all <colorProperty>
-    // elements now.
-    Map<String, String> defaultColors = _getDefaultColors(colorSchemes);
-    for (int i = 0; i < styleSheets.length; i++)
-    {
-      StyleSheetNode styleSheet = styleSheets[i];
-      // -= Simon Lessard =- 
-      // TODO: Check if synchronization is really needed.
-      Vector<StyleNode> stylesVector = new Vector<StyleNode>();
-      Iterator<StyleNode> stylesIterator = styleSheet.getStyles();
-      while (stylesIterator.hasNext())
-      {
-        boolean resolvedColorProperty = false;
-        StyleNode style = stylesIterator.next();
-        // -= Simon Lessard =- 
-        // TODO: Check if synchronization is really needed.
-        Vector<PropertyNode> propertiesVector = new Vector<PropertyNode>();
-        Iterator<PropertyNode> propertiesIterator = style.getProperties();
-        while (propertiesIterator.hasNext())
-        {
-          PropertyNode property = propertiesIterator.next();
-
-          if (property.__isColorProperty())
-          {
-            String name = property.getName();
-            String value = defaultColors.get(property.getValue());
-
-            assert (value != null);
-
-            property = new PropertyNode(name, value);
-
-            resolvedColorProperty = true;
-          }
-
-          propertiesVector.addElement(property);
-        }
-
-        if (resolvedColorProperty)
-        {
-          int count = propertiesVector.size();
-          PropertyNode[] properties = new PropertyNode[count];
-          propertiesVector.copyInto(properties);
-
-          style = new StyleNode(style, properties);
-        }
-
-        stylesVector.addElement(style);
-      }
-
-      // Create a new StyleSheetNode for the resolved styles
-      StyleNode[] styles = new StyleNode[stylesVector.size()];
-      stylesVector.copyInto(styles);
-      styleSheet = new StyleSheetNode(styleSheet, styles);
-
-      styleSheets[i] = styleSheet;
-    }
-
-    return styleSheets;
-  }
-
-  // Returns a Map of color names to (Strings) color values
-  private Map<String, String> _getDefaultColors(ColorSchemeNode[] colorSchemes)
-  {
-    // -= Simon Lessard =-
-    // TODO: Check if synchronization is really needed.
-    Hashtable<String, String> colors = new Hashtable<String, String>();
-
-    // Initialize the table with default values
-    for (int i = 0; i < _DEFAULT_COLORS.length; i += 2)
-      colors.put(_DEFAULT_COLORS[i], _DEFAULT_COLORS[i + 1]);
 
-    if (colorSchemes != null)
-    {
-      // Now, add any overridden values defined by the "default" color scheme
-      for (int i = 0; i < colorSchemes.length; i++)
-      {
-        ColorSchemeNode colorScheme = colorSchemes[i];
-        if ("default".equals(colorScheme.getName()))
-        {
-          Iterator<ColorNode> e = colorScheme.getColors();
-          while (e.hasNext())
-          {
-            ColorNode color = e.next();
-            colors.put(color.getName(), color.getValue());
-          }
-
-          break;
-        }
-      }
-    }
-
-    return colors;
-  }
 
   // Returns the document version for this style sheet, which
   // includes versions specified by any imported style sheets.
@@ -544,45 +324,8 @@
   // -= Simon Lessard =-
   // TODO: Check if synchronization is truly required
   private Vector<StyleSheetNode> _styleSheets;   // Vector of StyleSheetNode
-  private Vector<ColorSchemeNode> _colorSchemes;  // Vector of ColorSchemeNodes
   private ArrayList<StyleSheetDocument> _imports;       // Vector of imported StyleSheetDocument
   private String _documentVersion; // Version identifier for the document
 
-  // Default values for BLAF color scheme
-  private static final String[] _DEFAULT_COLORS =
-  {
-    "VeryDark",
-    "#003366",
-    "Dark",
-    "#336699",
-    "Medium",
-    "#6699cc",
-    "Light",
-    "#99ccff",
-    "VeryDarkShadowAccent",
-    "#333300",
-    "DarkShadowAccent",
-    "#666633",
-    "VeryDarkAccent",
-    "#999966",
-    "DarkAccent",
-    "#d2d8b0",
-    "MediumAccent",
-    "#ffffcc",
-    "LightAccent",
-    "#f7f7e7",
-    "VeryDarkExtraAccent",
-    "#333333",
-    "DarkExtraAccent",
-    "#666666",
-    "MediumExtraAccent",
-    "#999999",
-    "LightExtraAccent",
-    "#cccccc",
-    "AFTextForeground",
-    "#000000",
-    "AFTextBackground",
-    "#ffffff",
-  };
   private static final TrinidadLogger _LOG = TrinidadLogger.createTrinidadLogger(StyleSheetDocumentParser.class);
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java?view=diff&rev=524926&r1=524925&r2=524926
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java
(original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNode.java
Mon Apr  2 14:21:42 2007
@@ -40,18 +40,6 @@
  */
 public class StyleSheetNode
 {
-  // A private constructor that we are temporarily using while
-  // resolving the now-deprecated color properties
-  StyleSheetNode(StyleSheetNode styleSheet, StyleNode[] styles)
-  {
-    this (styles,
-          styleSheet._locales,
-          styleSheet._direction,
-          styleSheet._browsers,
-          styleSheet._versions,
-          styleSheet._platforms,
-          styleSheet._mode);
-  }
 
   /**
    * Creates a StyleSheetNode with the specified attributes.



Mime
View raw message