incubator-adffaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mat...@apache.org
Subject svn commit: r468175 [4/5] - in /incubator/adffaces/trunk/trinidad: trinidad-api/src/main/java-templates/org/apache/myfaces/trinidad/component/ trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ trinidad-api/src/main/java/org/apache/myfaces...
Date Thu, 26 Oct 2006 22:42:23 GMT
Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/Style.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/Style.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/Style.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/Style.java Thu Oct 26 15:42:18 2006
@@ -18,8 +18,6 @@
 
 import java.util.Iterator;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 /**
  * A Style object defines a set of visual (or aural) style properties.
  * The Style interface exposes two method for retrieving properties:
@@ -97,22 +95,22 @@
   /**
    * Constant for plain font style.
    */
-  public static final Object PLAIN_FONT_STYLE  = IntegerUtils.getInteger(0);
+  public static final Object PLAIN_FONT_STYLE  = 0;
 
   /**
    * Constant for italic font style.
    */
-  public static final Object ITALIC_FONT_STYLE = IntegerUtils.getInteger(1);
+  public static final Object ITALIC_FONT_STYLE = 1;
 
   /**
    * Constant for plain font weight.
    */
-  public static final Object PLAIN_FONT_WEIGHT = IntegerUtils.getInteger(0);
+  public static final Object PLAIN_FONT_WEIGHT = 0;
 
   /**
    * Constant for bold font weight.
    */
-  public static final Object BOLD_FONT_WEIGHT  = IntegerUtils.getInteger(1);
+  public static final Object BOLD_FONT_WEIGHT  = 1;
 
   /**
    * Returns the names of the properties defined by this style.

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/CSSUtils.java Thu Oct 26 15:42:18 2006
@@ -17,22 +17,17 @@
 package org.apache.myfaces.trinidadinternal.style.util;
 
 import java.awt.Color;
+import java.util.Collections;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 import java.util.Vector;
 
-import java.util.Collections;
-
 import org.apache.myfaces.trinidad.util.ArrayMap;
-
-import org.apache.myfaces.trinidadinternal.util.LRUCache;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-
 import org.apache.myfaces.trinidadinternal.style.CSSStyle;
-import org.apache.myfaces.trinidadinternal.style.Style;
 import org.apache.myfaces.trinidadinternal.style.PropertyParseException;
+import org.apache.myfaces.trinidadinternal.style.Style;
+import org.apache.myfaces.trinidadinternal.util.LRUCache;
 
 /**
  * CSS-related utilities. I think as we move away from xss, this code will
@@ -523,7 +518,7 @@
       throw new PropertyParseException(_INVALID_LENGTH + value);
     }
 
-    return IntegerUtils.getInteger(points);
+    return points;
   }
 
   // Parses length units
@@ -545,7 +540,7 @@
     }
 
     // We just assume the percentage is relative to our base font size - 12pt.
-    return IntegerUtils.getInteger((int)((percent/100.0) * 12));
+    return (int)((percent/100.0) * 12);
   }
 
   private static Color _getSharedColor(int rgb)
@@ -695,15 +690,15 @@
     // fixed defaults - it's better than throwing a PropertyParseException.
     // Again, if you don't like these values, don't use these keywords
     // for image-related styles!
-    "xx-small", IntegerUtils.getInteger(8),
-    "x-small",  IntegerUtils.getInteger(9),
-    "small",    IntegerUtils.getInteger(10),
-    "medium",   IntegerUtils.getInteger(12),
-    "large",    IntegerUtils.getInteger(14),
-    "x-large",  IntegerUtils.getInteger(16),
-    "xx-large", IntegerUtils.getInteger(18),
-    "smaller",  IntegerUtils.getInteger(10),
-    "larger",   IntegerUtils.getInteger(14)
+    "xx-small", 8,
+    "x-small",  9,
+    "small",    10,
+    "medium",   12,
+    "large",    14,
+    "x-large",  16,
+    "xx-large", 18,
+    "smaller",  10,
+    "larger",   14
   };
 
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/util/NameUtils.java Thu Oct 26 15:42:18 2006
@@ -21,7 +21,7 @@
 import java.util.Vector;
 
 import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
 
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/IntegerArrayEnumeration.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/IntegerArrayEnumeration.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/IntegerArrayEnumeration.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/IntegerArrayEnumeration.java Thu Oct 26 15:42:18 2006
@@ -18,8 +18,6 @@
 
 import java.util.Enumeration;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 /**
  * Dinky little class for enumerating an array of integers.
  * Note: This class assumes that the contents of the
@@ -55,7 +53,7 @@
    */
   public Integer nextElement()
   {
-    return IntegerUtils.getInteger(_array[_index++]);
+    return _array[_index++];
   }
 
   private int[] _array;

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=468175&r1=468174&r2=468175
==============================================================================
--- 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 Thu Oct 26 15:42:18 2006
@@ -31,7 +31,7 @@
 
 import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
 import java.util.Comparator;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/style/xml/parse/StyleSheetNodeParser.java Thu Oct 26 15:42:18 2006
@@ -21,21 +21,16 @@
 import java.util.Locale;
 import java.util.Vector;
 
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
 import org.apache.myfaces.trinidadinternal.share.xml.XMLUtils;
-
 import org.apache.myfaces.trinidadinternal.style.StyleConstants;
 import org.apache.myfaces.trinidadinternal.style.util.NameUtils;
 import org.apache.myfaces.trinidadinternal.style.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 /**
  * NodeParser for style sheet nodes
@@ -187,7 +182,7 @@
       int browser = NameUtils.getBrowser(browsers.next());
 
       if (browser != TrinidadAgent.APPLICATION_UNKNOWN)
-        v.addElement(IntegerUtils.getInteger(browser));
+        v.addElement(browser);
     }
 
     _browsers = _getIntegers(v);
@@ -217,7 +212,7 @@
       }
 
       if (version != 0)
-        v.addElement(IntegerUtils.getInteger(version));
+        v.addElement(version);
     }
 
     _versions = _getIntegers(v);
@@ -243,7 +238,7 @@
         platform = StyleSheetNode.__OS_UNIX;
 
       if (platform != TrinidadAgent.OS_UNKNOWN)
-        v.addElement(IntegerUtils.getInteger(platform));
+        v.addElement(platform);
     }
 
     _platforms = _getIntegers(v);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/ContextPoppingUINode.java Thu Oct 26 15:42:18 2006
@@ -19,8 +19,6 @@
 
 import org.apache.myfaces.trinidadinternal.util.OptimisticHashMap;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 import org.apache.myfaces.trinidadinternal.ui.BaseUINode;
 import org.apache.myfaces.trinidadinternal.ui.NodeRole;
@@ -60,7 +58,7 @@
     int childIndex
     )
   {
-    Integer key = IntegerUtils.getInteger(childIndex);
+    Integer key = childIndex;
 
     ContextPoppingUINode node = _sContextPoppers.get(key);
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/composite/RootChildBoundValue.java Thu Oct 26 15:42:18 2006
@@ -17,11 +17,8 @@
 
 import java.util.Hashtable;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-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.data.BoundValue;
 
 
@@ -56,7 +53,7 @@
     int childIndex
     )
   {
-    Integer key = IntegerUtils.getInteger(childIndex);
+    Integer key = childIndex;
 
     RootChildBoundValue node = _boundValues.get(key);
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafRenderer.java Thu Oct 26 15:42:18 2006
@@ -35,9 +35,6 @@
 import org.apache.myfaces.trinidadinternal.ui.data.bean.BeanAdapterUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeel;
 import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelExtension;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-
 
 /**
  * Base Rendering class
@@ -483,7 +480,7 @@
           int i
           )
   {
-    return IntegerUtils.getInteger(i);
+    return i;
   }
 
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/BaseLafUtils.java Thu Oct 26 15:42:18 2006
@@ -53,7 +53,7 @@
 import org.apache.myfaces.trinidadinternal.ui.data.bind.AndBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.data.bind.ComparisonBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.data.bind.DefaultingBoundValue;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
 import org.apache.myfaces.trinidadinternal.util.nls.LocaleUtils;
 
 /**

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/BaseDesktopUtils.java Thu Oct 26 15:42:18 2006
@@ -15,8 +15,6 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.desktop;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelManager;
@@ -75,7 +73,7 @@
     {
       // Initialize the NameAndAgentScorer for base/desktop
       super(lafName,
-            IntegerUtils.getInteger(TrinidadAgent.TYPE_DESKTOP),
+            TrinidadAgent.TYPE_DESKTOP,
             null,
             null,
             null);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/ColorPaletteRenderer.java Thu Oct 26 15:42:18 2006
@@ -50,7 +50,7 @@
     UINode node) throws IOException
   {
     super.prerender(context, node);
-    BaseDesktopUtils.addLib(context, "RGBColorFormat()");
+    BaseDesktopUtils.addLib(context, "TrColorConverter()");
   }
 
   @Override
@@ -176,7 +176,7 @@
     {
       Object id = getID(context, node);
       if (id == null)
-        id = "(void 0)";
+        id = "null";
       onCellClick = new StringBuffer(id.toString().length() +
                                      onColorSelect.toString().length() +
                                      16);
@@ -372,7 +372,7 @@
         {
           Object id = getID(context, node);
           if (id == null)
-            id = "(void 0)";
+            id = "null";
           StringBuffer sb = new StringBuffer(id.toString().length() +
                                              onColorSelect.toString().length() +
                                              21);
@@ -425,8 +425,8 @@
     // param b  handler body
     // param v  color value
     "function _onCPSel(s,b,v) {" +
-     "var parser = new RGBColorFormat(\"#RRGGBB\"); " +
-     "var color = (v != (void 0)) ? parser.getAsObject(v) : new Color(0,0,0,0); " +
+     "var parser = new TrColorConverter(\"#RRGGBB\"); " +
+     "var color = (v != null) ? parser.getAsObject(v) : new TrColor(0,0,0,0); " +
      "_handleClientEvent('colorSelect', s, {value:color}, b); }";
 
   private static final String _ON_CP_SEL_IE =
@@ -436,9 +436,9 @@
     "var ele=window.event.srcElement;" +
     "if (ele.tagName=='A') ele=ele.childNodes[0];" +
      "  if (ele.tagName == 'IMG') {" +
-        "var parser = new RGBColorFormat(\"#RRGGBB\"); " +
+        "var parser = new TrColorConverter(\"#RRGGBB\"); " +
         "var color = parser.getAsObject(ele.style.backgroundColor); " +
-        "if (color == (void 0)) { color = new Color(0,0,0,0) }; " +
+        "if (color == null) { color = new TrColor(0,0,0,0) }; " +
         "_handleClientEvent('colorSelect', s, {value:color}, b);" +
        "}" +
      "}";
@@ -452,9 +452,9 @@
       "var ele=e.target; if (ele.tagName=='A') ele=ele.childNodes[0];"+
       " if (ele.tagName == 'IMG') {" +
         "var color = ele.style.backgroundColor;" +
-        "var parser = new RGBColorFormat([\"'rgb'(r, g, b)\",\"'rgb'(r,g,b)\",\"#RRGGBB\"]); " +
+        "var parser = new TrColorConverter([\"'rgb'(r, g, b)\",\"'rgb'(r,g,b)\",\"#RRGGBB\"]); " +
         "color = parser.getAsObject(color); " +
-        "if (color == (void 0)) { color = new Color(0,0,0,0) }; " +
+        "if (color == null) { color = new TrColor(0,0,0,0) }; " +
         "_handleClientEvent('colorSelect', s, {value:color}, b);" +
        "}" +
      "}";

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GeneratedImageRenderer.java Thu Oct 26 15:42:18 2006
@@ -26,7 +26,7 @@
 
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
 
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/GlobalButtonRenderer.java Thu Oct 26 15:42:18 2006
@@ -19,14 +19,12 @@
 
 import javax.faces.context.ResponseWriter;
 
+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.laf.base.xhtml.LinkUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UINode;
 
 /**
  * Renderer for global buttons
@@ -87,7 +85,7 @@
       renderStyleClassAttribute(context, AF_MENU_BUTTONS_IMAGE_STYLE_CLASS);
       renderURIAttribute(context, SOURCE_ATTRIBUTE, iconURI);
       renderAltAndTooltipForImage(context, shortDesc);
-      renderAttribute(context, BORDER_ATTRIBUTE, IntegerUtils.getInteger(0));
+      renderAttribute(context, BORDER_ATTRIBUTE, 0);
       renderAttribute(context, node, WIDTH_ATTRIBUTE, WIDTH_ATTR);
       renderAttribute(context, node, HEIGHT_ATTRIBUTE, HEIGHT_ATTR);
       writer.endElement(IMAGE_ELEMENT);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/HeaderRenderer.java Thu Oct 26 15:42:18 2006
@@ -20,15 +20,11 @@
 import javax.faces.component.UIComponent;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
+import org.apache.myfaces.trinidad.skin.Icon;
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
-
 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.trinidad.skin.Icon;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/laf/base/desktop/HeaderRenderer.java#0 $) $Date: 10-nov-2005.18:55:17 $
@@ -292,7 +288,7 @@
       else
         size = sizeNumber.intValue() + 1;
         
-      setContextHeaderSize( context, IntegerUtils.getInteger(size));
+      setContextHeaderSize( context, size);
     }
 
     return size;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SideNavRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SideNavRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SideNavRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SideNavRenderer.java Thu Oct 26 15:42:18 2006
@@ -20,9 +20,8 @@
 
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 
 /**
@@ -44,7 +43,7 @@
     int selectedIndex =  getResolvedSelectedIndex( context, node);
 
     context.setLocalProperty( _SELECTED_INDEX_KEY,
-                              IntegerUtils.getInteger(selectedIndex));
+                              selectedIndex);
   }
 
   @Override
@@ -58,7 +57,7 @@
 
     int selectedIndex = ((Number)context.getLocalProperty(0,
                                       _SELECTED_INDEX_KEY,
-                                      IntegerUtils.getInteger(-1))).intValue();
+                                      -1)).intValue();
 
     ResponseWriter writer = context.getResponseWriter();
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/HeaderRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/HeaderRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/HeaderRenderer.java Thu Oct 26 15:42:18 2006
@@ -16,18 +16,15 @@
 package org.apache.myfaces.trinidadinternal.ui.laf.base.pda;
 
 import java.io.IOException;
-
 import java.util.HashMap;
 import java.util.Map;
-import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafConstants;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.component.core.layout.CorePanelHeader;
-
-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.laf.base.xhtml.XhtmlLafConstants;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
 
 
@@ -63,7 +60,7 @@
             else
                 size = sizeNumber.intValue() + 1;
 
-            setContextHeaderSize( context, IntegerUtils.getInteger(size));
+            setContextHeaderSize( context, size);
         }
 
         return size;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLafUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLafUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/pda/PdaHtmlLafUtils.java Thu Oct 26 15:42:18 2006
@@ -15,13 +15,10 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.laf.base.pda;
 
-import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
-
 import org.apache.myfaces.trinidadinternal.ui.laf.LookAndFeelManager;
 import org.apache.myfaces.trinidadinternal.ui.laf.NameAndAgentScorer;
+import org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml.XhtmlLafUtils;
 
 /**
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/laf/base/pda/PdaHtmlLafUtils.java#0 $) $Date: 10-nov-2005.18:55:02 $
@@ -46,7 +43,7 @@
 
   private static final NameAndAgentScorer _SCORER =
     new NameAndAgentScorer(null,
-                           IntegerUtils.getInteger(TrinidadAgent.TYPE_PDA),
+                           TrinidadAgent.TYPE_PDA,
                            null,
                            null,
                            null);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/LinkDataObject.java Thu Oct 26 15:42:18 2006
@@ -18,16 +18,14 @@
 import java.io.IOException;
 
 import org.apache.myfaces.trinidad.component.UIXHierarchy;
-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.data.DataObject;
 import org.apache.myfaces.trinidadinternal.ui.data.DataObjectList;
 import org.apache.myfaces.trinidadinternal.ui.data.ListDataObjectList;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 /**
  * used by GlobalButtonRenderer and TabBarRenderer
  *
@@ -55,7 +53,7 @@
       // this is, not just the index of the visible children.
       BaseLafUtils.setRenderingProperty(context,
                                         _CURRENT_INDEX_KEY,
-                                        IntegerUtils.getInteger(childIndex));
+                                        childIndex);
 
       if ((child != null) &&
           !Boolean.FALSE.equals(
@@ -126,7 +124,7 @@
       {
         // needed for TrainRenderer. It is important to know what child index
         // this is, not just the index of the visible children.
-        LinkDataObject.__setCurrentIndex(context, IntegerUtils.getInteger(i));
+        LinkDataObject.__setCurrentIndex(context, i);
 
         if ((stamp != null) &&
             !Boolean.FALSE.equals(
@@ -166,7 +164,7 @@
       // this is, not just the index of the visible children.
       BaseLafUtils.setRenderingProperty(context,
                                         _CURRENT_INDEX_KEY,
-                                        IntegerUtils.getInteger(childIndex));
+                                        childIndex);
 
       if ((child != null) &&
           !Boolean.FALSE.equals(
@@ -313,7 +311,7 @@
     Object currentIndex =
       BaseLafUtils.getRenderingProperty(context, _CURRENT_INDEX_KEY, null);
     if (currentIndex == null)
-      return IntegerUtils.getInteger(-1);
+      return -1;
     else
       return (Integer)currentIndex;
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/NavigationBarRenderer.java Thu Oct 26 15:42:18 2006
@@ -25,7 +25,7 @@
 import org.apache.myfaces.trinidad.context.RenderingContext;
 import org.apache.myfaces.trinidad.skin.Skin;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
 
 import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/PageRenderer.java Thu Oct 26 15:42:18 2006
@@ -20,13 +20,12 @@
 import javax.faces.component.UIComponent;
 
 import org.apache.myfaces.trinidad.component.UIXPage;
-
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 import org.apache.myfaces.trinidadinternal.ui.BaseMutableUINode;
 import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
-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.collection.UINodeList;
 import org.apache.myfaces.trinidadinternal.ui.composite.ContextPoppingUINode;
@@ -37,7 +36,6 @@
 import org.apache.myfaces.trinidadinternal.ui.data.BoundValue;
 import org.apache.myfaces.trinidadinternal.ui.data.bind.NotBoundValue;
 import org.apache.myfaces.trinidadinternal.ui.data.bind.OrBoundValue;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 
 /**
@@ -82,13 +80,13 @@
                   new BaseMutableUINode(UIConstants.MARLIN_NAMESPACE,
                                         UIConstants.PAGE_MENU_TABS_NAME);
     menuTabs.setAttributeValue(UIConstants.LEVEL_ATTR,
-                               IntegerUtils.getInteger(1));
+                               1);
     pageLayout.setNamedChild(UIConstants.NAVIGATION1_CHILD, menuTabs);
     MutableUINode menuBar =
                   new BaseMutableUINode(UIConstants.MARLIN_NAMESPACE,
                                         UIConstants.PAGE_MENU_BAR_NAME);
     menuBar.setAttributeValue(UIConstants.LEVEL_ATTR,
-                              IntegerUtils.getInteger(2));
+                              2);
     pageLayout.setNamedChild(UIConstants.NAVIGATION2_CHILD, menuBar);
 
     // add the tree
@@ -97,7 +95,7 @@
                   new BaseMutableUINode(UIConstants.MARLIN_NAMESPACE,
                                         UIConstants.PAGE_NAVIGATION_TREE_NAME);
     navigationTree.setAttributeValue(UIConstants.START_LEVEL_ATTR,
-                              IntegerUtils.getInteger(3));
+                              3);
 
     BoundValue treeRenderedBV = new HasDataBoundValue(
                                   RootBoundValue.getBoundValue(), 3, true);
@@ -121,7 +119,7 @@
                   new BaseMutableUINode(UIConstants.MARLIN_NAMESPACE,
                                         UIConstants.PAGE_MENU_LIST_NAME);
     menuList.setAttributeValue(UIConstants.LEVEL_ATTR,
-                              IntegerUtils.getInteger(3));
+                              3);
     BoundValue listRenderedBV = new HasDataBoundValue(
                                   RootBoundValue.getBoundValue(), 3, false);
     menuList.setAttributeValue(UIConstants.RENDERED_ATTR, listRenderedBV);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/ProcessUtils.java Thu Oct 26 15:42:18 2006
@@ -30,7 +30,7 @@
 import org.apache.myfaces.trinidadinternal.ui.beans.MarlinBean;
 import org.apache.myfaces.trinidad.context.RenderingContext;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
 
 
 /**

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=468175&r1=468174&r2=468175
==============================================================================
--- 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 Thu Oct 26 15:42:18 2006
@@ -49,7 +49,7 @@
 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;
+import org.apache.myfaces.trinidad.util.IntegerUtils;
 
 
 /**
@@ -1641,7 +1641,7 @@
     {
       resolvedSelectedIndexFromCache = getResolvedSelectedIndex(context, node);
       context.setLocalProperty(_SELECTED_CHILD_INDEX_KEY,
-        IntegerUtils.getInteger(resolvedSelectedIndexFromCache));
+        resolvedSelectedIndexFromCache);
     }
     return resolvedSelectedIndexFromCache;
   }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/xhtml/XhtmlLafUtils.java Thu Oct 26 15:42:18 2006
@@ -16,7 +16,6 @@
 package org.apache.myfaces.trinidadinternal.ui.laf.base.xhtml;
 
 import java.io.IOException;
-
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -29,19 +28,16 @@
 import javax.faces.context.FacesContext;
 import javax.faces.context.ResponseWriter;
 
-import org.apache.myfaces.trinidad.logging.TrinidadLogger;
 import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.logging.TrinidadLogger;
+import org.apache.myfaces.trinidad.skin.Icon;
+import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.AutoSubmitUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.FormRenderer;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.PartialPageUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.jsLibs.Scriptlet;
-
-import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
 import org.apache.myfaces.trinidadinternal.share.config.Configuration;
 import org.apache.myfaces.trinidadinternal.share.data.ServletRequestParameters;
 import org.apache.myfaces.trinidadinternal.share.url.FormEncoder;
@@ -53,10 +49,10 @@
 import org.apache.myfaces.trinidadinternal.style.util.StyleUtils;
 import org.apache.myfaces.trinidadinternal.ui.AttributeKey;
 import org.apache.myfaces.trinidadinternal.ui.MutableUINode;
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
+import org.apache.myfaces.trinidadinternal.ui.NodeUtils;
 import org.apache.myfaces.trinidadinternal.ui.UIConstants;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidad.skin.Icon;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.BaseLafUtils;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.MutableProperty;
 
@@ -592,7 +588,7 @@
 
     // push the flags of the styles actually written
     Stack<Object> stackInfo = _getStyleInfoStack(styleInfo, _STACK_FLAGS_INDEX);
-    stackInfo.push(IntegerUtils.getInteger(flags));
+    stackInfo.push(flags);
   }
 
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/MessageBoxRenderer.java Thu Oct 26 15:42:18 2006
@@ -22,13 +22,11 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.context.RenderingContext;
+import org.apache.myfaces.trinidad.skin.Icon;
+import org.apache.myfaces.trinidad.skin.Skin;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidad.skin.Skin;
-import org.apache.myfaces.trinidad.skin.Icon;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * MessageBox Renderer for the desktop implementation of the
@@ -316,7 +314,7 @@
     if (bodyColumnCount == 1)
       return null;
 
-    return IntegerUtils.getInteger(bodyColumnCount);
+    return bodyColumnCount;
   }
 
   // Returns the number of columns for the bottom background cell
@@ -336,7 +334,7 @@
     if (backgroundColumnCount == 1)
       return null;
 
-    return IntegerUtils.getInteger(backgroundColumnCount);
+    return backgroundColumnCount;
   }
 
   // Returns the number of columns for the top background cell
@@ -356,7 +354,7 @@
     if (backgroundColumnCount == 1)
       return null;
 
-    return IntegerUtils.getInteger(backgroundColumnCount);
+    return backgroundColumnCount;
   }
 
   // Get the IconData to use for rendering this sideBar

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/desktop/SideBarRenderer.java Thu Oct 26 15:42:18 2006
@@ -22,13 +22,11 @@
 import javax.faces.context.ResponseWriter;
 
 import org.apache.myfaces.trinidad.context.RenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
-import org.apache.myfaces.trinidadinternal.ui.UINode;
-import org.apache.myfaces.trinidad.skin.Skin;
 import org.apache.myfaces.trinidad.skin.Icon;
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
+import org.apache.myfaces.trinidad.skin.Skin;
 import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.OutputUtils;
+import org.apache.myfaces.trinidadinternal.ui.UINode;
+import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 
 /**
  * SideBar Renderer for the desktop implementation of the
@@ -353,7 +351,7 @@
     if (bodyColumnCount == 1)
       return null;
 
-    return IntegerUtils.getInteger(bodyColumnCount);
+    return bodyColumnCount;
   }
 
   // Returns the number of columns for the bottom background cell
@@ -373,7 +371,7 @@
     if (backgroundColumnCount == 1)
       return null;
 
-    return IntegerUtils.getInteger(backgroundColumnCount);
+    return backgroundColumnCount;
   }
 
   // Returns the number of columns for the top background cell
@@ -393,7 +391,7 @@
     if (backgroundColumnCount == 1)
       return null;
 
-    return IntegerUtils.getInteger(backgroundColumnCount);
+    return backgroundColumnCount;
   }
 
   // Get the IconData to use for rendering this sideBar
@@ -486,5 +484,5 @@
   // Keys for looking up IconData properties on the Skin
   private static final Object _ICONS_KEY = new Object();
 
-  private static final Integer _MINIMUM_WIDTH = IntegerUtils.getInteger(150);
+  private static final Integer _MINIMUM_WIDTH = 150;
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/simple/pda/SimplePdaUtils.java Thu Oct 26 15:42:18 2006
@@ -20,10 +20,6 @@
 import org.apache.myfaces.trinidadinternal.ui.laf.NameAndAgentScorer;
 import org.apache.myfaces.trinidadinternal.ui.laf.base.pda.PdaHtmlLafUtils;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
-
-
 /**
  * @version $Name:  $ ($Revision: adfrt/faces/adf-faces-impl/src/main/java/oracle/adfinternal/view/faces/ui/laf/simple/pda/SimplePdaUtils.java#0 $) $Date: 10-nov-2005.18:50:47 $
  * @author The Oracle ADF Faces Team
@@ -49,7 +45,7 @@
 
   private static final NameAndAgentScorer _PDA_SCORER =
     new NameAndAgentScorer("simple",
-                           IntegerUtils.getInteger(TrinidadAgent.TYPE_PDA),
+                           TrinidadAgent.TYPE_PDA,
                            null,
                            null,
                            null);

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/xml/parse/ImageIconParser.java Thu Oct 26 15:42:18 2006
@@ -16,25 +16,17 @@
 
 package org.apache.myfaces.trinidadinternal.ui.laf.xml.parse;
 
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXParseException;
-
-
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 import org.apache.myfaces.trinidad.logging.TrinidadLogger;
-
+import org.apache.myfaces.trinidad.skin.Icon;
 import org.apache.myfaces.trinidadinternal.share.xml.BaseNodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.NodeParser;
 import org.apache.myfaces.trinidadinternal.share.xml.ParseContext;
-
-import org.apache.myfaces.trinidadinternal.style.Style;
-
-import org.apache.myfaces.trinidad.skin.Icon;
 import org.apache.myfaces.trinidadinternal.skin.icon.ContextImageIcon;
 import org.apache.myfaces.trinidadinternal.skin.icon.URIImageIcon;
-
+import org.apache.myfaces.trinidadinternal.style.Style;
 import org.apache.myfaces.trinidadinternal.ui.laf.xml.XMLConstants;
+import org.xml.sax.Attributes;
+import org.xml.sax.SAXParseException;
 
 /**
  * NodeParser for ImageIcons.
@@ -152,7 +144,7 @@
       // =-=ags Should we check to make sure that we
       //        don't have a negative value?
 
-      return IntegerUtils.getInteger(intValue);
+      return intValue;
     }
     catch (NumberFormatException e)
     {

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/path/PathImpl.java Thu Oct 26 15:42:18 2006
@@ -15,8 +15,6 @@
  */
 package org.apache.myfaces.trinidadinternal.ui.path;
 
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
-
 import org.apache.myfaces.trinidadinternal.ui.UIXRenderingContext;
 import org.apache.myfaces.trinidadinternal.ui.UINode;
 
@@ -119,7 +117,7 @@
    */
   public void add(int indexedChild)
   {
-    _add(IntegerUtils.getInteger(indexedChild));
+    _add(indexedChild);
   }
 
 
@@ -147,7 +145,7 @@
           _elements[length + i] = path.getElementName(i);
         else
           _elements[length + i] =
-             IntegerUtils.getInteger(path.getElementIndex(i));
+             path.getElementIndex(i);
       }
     }
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/ByteLengthValidator.java Thu Oct 26 15:42:18 2006
@@ -183,7 +183,7 @@
   private FacesMessage _getEscapedJsMaximumMessage(
     FacesContext context)
   {
-    String maxMsgDetail = getMaximumMessageDetail();
+    String maxMsgDetail = getMessageDetailMaximum();
     String maxLength = String.valueOf(getMaximum());
     String label = "{0}";    // this will get substituted on the client
 

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateTimeRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateTimeRangeValidator.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateTimeRangeValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DateTimeRangeValidator.java Thu Oct 26 15:42:18 2006
@@ -14,15 +14,20 @@
 * limitations under the License.
 */
 package org.apache.myfaces.trinidadinternal.validator;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 
 import javax.faces.validator.ValidatorException;
 import javax.faces.context.FacesContext;
 import javax.faces.component.UIComponent;
 
+import org.apache.myfaces.trinidad.validator.ClientValidator;
+import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
 import org.apache.myfaces.trinidadinternal.convert.GenericConverterFactory;
 
 public class DateTimeRangeValidator extends org.apache.myfaces.trinidad.validator.DateTimeRangeValidator
+                                       implements ClientValidator
 {
   public DateTimeRangeValidator()
   {
@@ -44,4 +49,48 @@
     }
     super.validate(context, component, value);
   }
-}
+  
+  
+  public Collection<String> getClientImportNames()
+  {
+    return _IMPORT_NAMES;
+  }
+
+  public String getClientScript(
+   FacesContext context,
+   UIComponent component)
+  {
+    return null;
+  }
+
+
+  /**
+   * @todo this should have not_in_range messages, not just max and min!
+   * @todo Format these numbers properly.
+   */
+  public String getClientValidation(
+    FacesContext context,
+    UIComponent component)
+  {
+    
+    String maxStr = Long.toString(getMaximum().getTime());
+    String minStr = Long.toString(getMinimum().getTime());
+    
+    return  ConverterUtils.getClientValidation(context, component,
+                                               MAXIMUM_MESSAGE_ID,
+                                               MINIMUM_MESSAGE_ID,
+                                               org.apache.myfaces.trinidad.validator.DateTimeRangeValidator.VALIDATOR_ID,
+                                               maxStr, minStr, "TrDateTimeRangeValidator");
+  }
+  
+  
+  public String getClientLibrarySource(
+   FacesContext context)
+  {
+    return null;
+  }
+  
+  private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
+  
+  
+}
\ No newline at end of file

Added: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DoubleRangeValidator.java?view=auto&rev=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DoubleRangeValidator.java (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/DoubleRangeValidator.java Thu Oct 26 15:42:18 2006
@@ -0,0 +1,81 @@
+/*
+ * Copyright  2003-2006 The Apache Software Foundation.
+ * 
+ * Licensed 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.myfaces.trinidadinternal.validator;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.trinidad.validator.ClientValidator;
+import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
+
+
+
+
+/**
+ * <p>Implementation for <code>java.lang.Long</code> values.</p>
+ *
+ * @author The Oracle ADF Faces Team
+ */
+public class DoubleRangeValidator extends org.apache.myfaces.trinidad.validator.DoubleRangeValidator
+                                implements ClientValidator
+{
+
+  public Collection<String> getClientImportNames()
+  {
+    return _IMPORT_NAMES;
+  }
+
+  public String getClientScript(
+   FacesContext context,
+   UIComponent component)
+  {
+    return null;
+  }
+
+
+  /**
+   * @todo this should have not_in_range messages, not just max and min!
+   * @todo Format these numbers properly.
+   */
+  public String getClientValidation(
+    FacesContext context,
+    UIComponent component)
+  {
+    
+    String maxStr = Double.toString(getMaximum());
+    String minStr = Double.toString(getMinimum());
+    
+    return  ConverterUtils.getClientValidation(context, component,
+                                               MAXIMUM_MESSAGE_ID,
+                                               MINIMUM_MESSAGE_ID,
+                                               javax.faces.validator.DoubleRangeValidator.VALIDATOR_ID,
+                                               maxStr, minStr, "TrRangeValidator");
+  }
+  
+  
+  public String getClientLibrarySource(
+   FacesContext context)
+  {
+    return null;
+  }
+  
+  private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
+
+}
\ No newline at end of file

Added: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LengthValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LengthValidator.java?view=auto&rev=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LengthValidator.java (added)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LengthValidator.java Thu Oct 26 15:42:18 2006
@@ -0,0 +1,80 @@
+/*
+ * Copyright  2003-2006 The Apache Software Foundation.
+ * 
+ * Licensed 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.myfaces.trinidadinternal.validator;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+
+import org.apache.myfaces.trinidad.util.IntegerUtils;
+import org.apache.myfaces.trinidad.validator.ClientValidator;
+import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
+
+
+
+
+/**
+ * <p>Implementation for <code>java.lang.Long</code> values.</p>
+ *
+ * @author The Oracle ADF Faces Team
+ */
+public class LengthValidator extends org.apache.myfaces.trinidad.validator.LengthValidator
+                                implements ClientValidator
+{
+
+  public Collection<String> getClientImportNames()
+  {
+    return _IMPORT_NAMES;
+  }
+
+  public String getClientScript(
+   FacesContext context,
+   UIComponent component)
+  {
+    return null;
+  }
+
+
+  /**
+   * @todo this should have not_in_range messages, not just max and min!
+   * @todo Format these numbers properly.
+   */
+  public String getClientValidation(
+    FacesContext context,
+    UIComponent component)
+  {
+    String maxStr = IntegerUtils.getString(getMaximum());
+    String minStr = IntegerUtils.getString(getMinimum());
+    return  ConverterUtils.getClientValidation(context, component,
+                                               MAXIMUM_MESSAGE_ID,
+                                               MINIMUM_MESSAGE_ID,
+                                               javax.faces.validator.LengthValidator.VALIDATOR_ID,
+                                               maxStr, minStr, "TrLengthValidator");
+  }
+  
+  
+  public String getClientLibrarySource(
+   FacesContext context)
+  {
+    return null;
+  }
+  
+  private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
+
+}
\ No newline at end of file

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java Thu Oct 26 15:42:18 2006
@@ -19,16 +19,12 @@
 import java.util.Collection;
 import java.util.Collections;
 
-import javax.faces.application.FacesMessage;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 
-import javax.faces.validator.ValidatorException;
-import org.apache.myfaces.trinidad.util.MessageFactory;
-
+import org.apache.myfaces.trinidad.util.IntegerUtils;
 import org.apache.myfaces.trinidad.validator.ClientValidator;
 import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
-import org.apache.myfaces.trinidadinternal.util.IntegerUtils;
 
 
 
@@ -38,60 +34,10 @@
  *
  * @author The Oracle ADF Faces Team
  */
-public class LongRangeValidator extends javax.faces.validator.LongRangeValidator
+public class LongRangeValidator extends org.apache.myfaces.trinidad.validator.LongRangeValidator
                                 implements ClientValidator
 {
-  @Override
-  public void validate(
-    FacesContext context,
-    UIComponent component,
-    Object value
-    ) throws ValidatorException
-  {
-    try
-    {
-      super.validate(context, component, value);
-    }
-    catch (ValidatorException ve)
-    {
-         
-      Object label = component.getAttributes().get("label");
-      if ( null == label)
-       label = component.getValueBinding("label");
-       
-      if (value != null && value instanceof Number)
-      {
-        long longValue = ((Number)value).longValue(); 
-        
-        if (longValue > _getMaximum()) 
-        {
-          String maxStr = IntegerUtils.getString(_getMaximum());
-          FacesMessage msg = MessageFactory.getMessage(context,
-                                            MAXIMUM_MESSAGE_ID,
-                                            new Object[]{label, value, maxStr},
-                                            label);                                       
-          throw new ValidatorException(msg);         
-        }
-        else
-        {
-          String minStr = IntegerUtils.getString(_getMinimum());   
-          FacesMessage msg = MessageFactory.getMessage(context,
-                                            MINIMUM_MESSAGE_ID,
-                                            new Object[]{label, value, minStr},
-                                            label);
-                                            
-                                         
-          throw new ValidatorException(msg);    
-        }
-      }
-      else
-      {
-        throw ve;
-      }
-    }     
-  }
 
-  
   public Collection<String> getClientImportNames()
   {
     return _IMPORT_NAMES;
@@ -113,13 +59,13 @@
     FacesContext context,
     UIComponent component)
   {
-    String maxStr = IntegerUtils.getString(_getMaximum());
-    String minStr = IntegerUtils.getString(_getMinimum());
+    String maxStr = IntegerUtils.getString(getMaximum());
+    String minStr = IntegerUtils.getString(getMinimum());
     return  ConverterUtils.getClientValidation(context, component,
                                                MAXIMUM_MESSAGE_ID,
                                                MINIMUM_MESSAGE_ID,
-                                               VALIDATOR_ID,
-                                               maxStr, minStr);
+                                               javax.faces.validator.LongRangeValidator.VALIDATOR_ID,
+                                               maxStr, minStr, "TrRangeValidator");
   }
   
   
@@ -129,80 +75,6 @@
     return null;
   }
   
+  private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrNumberConverter()" );
 
-  // not overriding getMaximum because I'll suddenly
-  // start returning something other than 0...
-  private long _getMaximum()
-  {
-    if (_maximumSet)
-      return super.getMaximum();
-
-    return Long.MAX_VALUE;
-  }
-
-  private long _getMinimum()
-  {
-    if (_minimumSet)
-      return super.getMinimum();
-
-    return Long.MIN_VALUE;
-  }
-
-
-  /**
-   * <p>Set the maximum value .</p>
-   *
-   * @param maximum The new maximum value
-   *
-   */
-  @Override
-  public void setMaximum(long maximum)
-  {
-    super.setMaximum(maximum);
-    _maximumSet = true;
-    
-  }
-
-  /**
-   * <p>Set the minimum value .</p>
-   *
-   * @param minimum The new minimum value
-   *
-   */
-  @Override
-  public void setMinimum(long minimum)
-  {
-    super.setMinimum(minimum);
-    _minimumSet = true;
-  }
-
-  @Override
-  public Object saveState(FacesContext context)
-  {
-    Object values[] = new Object[2];
-    Object clientValues[] = new Object[2];
-    
-    clientValues[0] = _maximumSet ? Boolean.TRUE : Boolean.FALSE;
-    clientValues[1] = _minimumSet ? Boolean.TRUE : Boolean.FALSE;
-    
-    values[0] = super.saveState(context);
-    values[1] = clientValues;
-    return (values);
-  }
-
-  @Override
-  public void restoreState(FacesContext context, Object state)
-  {
-    Object values[] = (Object[]) state;
-    super.restoreState(context, values[0]);
-    Object clientValues[] = (Object[])values[1];
-    _maximumSet = ((Boolean) clientValues[0]).booleanValue();
-    _minimumSet = ((Boolean) clientValues[1]).booleanValue();
-  }
-
-
-  private boolean _maximumSet = false;
-  private boolean _minimumSet = false;
-  private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "DecimalConvert()" );
-
-}
+}
\ No newline at end of file

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/RegExpValidator.java Thu Oct 26 15:42:18 2006
@@ -75,7 +75,7 @@
                                               + esNoMatchMsgPattern.length()
                                               + esNoMatchMsgSummaryPattern.length());
 
-    outBuffer.append("new RegExpFormat('"); // 18
+    outBuffer.append("new TrRegExpValidator('"); // 18
     outBuffer.append(jsPattern);
     outBuffer.append("',{NM:'");            //  7
     outBuffer.append(esNoMatchMsgPattern);
@@ -100,7 +100,7 @@
   private FacesMessage _getNoMatchMessage(
     FacesContext context)
   {
-    String noMatchMsg = getNoMatchMessageDetail(); 
+    String noMatchMsg = getMessageDetailNoMatch(); 
     Object[] params = new Object[] {"{0}", "{1}", "{2}"};
 
     return MessageFactory.getMessage(context,
@@ -110,5 +110,5 @@
   }
 
 
-  private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "RegExpFormat()" );     
+  private static final Collection<String> _IMPORT_NAMES = Collections.singletonList( "TrRegExpValidator()" );     
 }

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CharSets.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CharSets.js?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CharSets.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/CharSets.js Thu Oct 26 15:42:18 2006
@@ -14,28 +14,36 @@
  * limitations under the License.
  */
 
-/*
-**Test
-*/
-
-function EncodingFormat(
+function TrByteLengthValidator(
   length,
   messages
   )
 {
   this._length   = length;
   this._messages = messages;
-  this._class    = "EncodingFormat";
+  this._class    = "TrByteLengthValidator";
 }
 
-EncodingFormat.prototype = new TrValidator();
+TrByteLengthValidator.prototype = new TrValidator();
 
 //LFS - Length failed summary
-EncodingFormat.prototype.LFS  = "LFS";
+TrByteLengthValidator.prototype.LFS  = "LFS";
 //LF - Length failed
-EncodingFormat.prototype.LF  = "LF";
+TrByteLengthValidator.prototype.LF  = "LF";
+
+function CjkFormat(
+  length,
+  messages
+  )
+{
+  this._base = TrByteLengthValidator;
+  this._base(length, messages);
+  this._class = "CjkFormat";
+  
+}
 
-function _cjkParse(
+CjkFormat.prototype = new TrByteLengthValidator();
+CjkFormat.prototype.validate  = function(
   parseString,
   label
   )
@@ -65,22 +73,21 @@
 }
 
 
-function CjkFormat(
+
+
+function Utf8Format(
   length,
   messages
   )
 {
-  this._base = EncodingFormat;
+  this._base = TrByteLengthValidator;
   this._base(length, messages);
-  this._class = "CjkFormat";
-  
+  this._class = "Utf8Format";
 }
 
 
-CjkFormat.prototype = new EncodingFormat();
-CjkFormat.prototype.validate  = _cjkParse;
-
-function _utf8Parse(
+Utf8Format.prototype = new TrByteLengthValidator();
+Utf8Format.prototype.validate  = function(
   parseString,
   label
   )
@@ -117,24 +124,20 @@
   return parseString;
 }
 
-
-function Utf8Format(
+function SBFormat(
   length,
   messages
   )
 {
-  this._base = EncodingFormat;
+  this._base = TrByteLengthValidator;
   this._base(length, messages);
-  this._class = "Utf8Format";
+  this._class = "SBFormat";
+  
 }
 
 
-Utf8Format.prototype = new EncodingFormat();
-Utf8Format.prototype.validate  = _utf8Parse;
-
-
-
-function _sbParse(
+SBFormat.prototype = new TrByteLengthValidator();
+SBFormat.prototype.validate  = function(
   parseString,
   label
   )
@@ -149,22 +152,4 @@
   }
 
   return parseString;
-}
-
-
-function SBFormat(
-  length,
-  messages
-  )
-{
-  this._base = EncodingFormat;
-  this._base(length, messages);
-  this._class = "SBFormat";
-  
-}
-
-
-SBFormat.prototype = new EncodingFormat();
-SBFormat.prototype.validate  = _sbParse;
-
-
+}
\ No newline at end of file

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorField.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorField.js?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorField.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorField.js Thu Oct 26 15:42:18 2006
@@ -35,7 +35,7 @@
   var value = null;
   var swatch = _getElementById(document, swatchID);
 
-  if (swatch != (void 0))
+  if (swatch != null)
   {
     var converterError = false;
     if (colorField.value != "")
@@ -53,14 +53,14 @@
     {
       if (value.alpha == 0)
       {
-        swatch.style.backgroundColor = (void 0);
+        swatch.style.backgroundColor = null;
         swatch.src = _cfTransIconURL;
         swatch.alt = _cfTrans;
       }
       else
       {
         swatch.style.backgroundColor = 
-          new RGBColorFormat("#RRGGBB").getAsString(value);
+          new TrColorConverter("#RRGGBB").getAsString(value);
         swatch.src = _cfOpaqueIconURL;
         swatch.alt = cff.getAsString(value);
       }
@@ -69,7 +69,7 @@
     {
       swatch.style.backgroundColor = _cfBgColor;
       swatch.src = _cfOpaqueIconURL;
-      swatch.alt = (void 0);
+      swatch.alt = null;
     }
 
     // make sure tooltips are updated correctly
@@ -90,7 +90,7 @@
   var colorField = closingWindow._colorField;
 
   // See below!
-  if (colorField == (void 0))
+  if (colorField == null)
   {
     colorField = _savedColorField1879034;
   }
@@ -114,7 +114,7 @@
   colorField,
   newColor)
 {
-  if (colorField != (void 0))
+  if (colorField != null)
   {
     //
     // get the format to use to format the result
@@ -134,7 +134,7 @@
 
     //pu: In case of blank selection from external picker, undefined newValue is 
     // legitimate, but "undefined" should not literally appear in the text area.
-    if (newValue == (void 0))
+    if (newValue == null)
       newValue="";
 
     if (newValue != colorField.value)
@@ -144,7 +144,7 @@
       // with only color swatch displayed
       // bug 2275982
       // trigger onchange programatically
-      if (colorField.onchange != (void 0))
+      if (colorField.onchange != null)
       {
         // The IE event delivery mechanism for built-in events like onchange
         // automatically sets the window.event property for inspection by
@@ -268,7 +268,7 @@
   
   var patterns = _cfs[nameInForm];
   var pattern = "#RRGGBB"
-  if (patterns != (void 0))
+  if (patterns != null)
   {
     destination += "&pattern=";
     if (typeof patterns == "string")
@@ -298,7 +298,7 @@
         if (color.alpha == 0)
           destination += escape(_cfTrans);
         else
-          destination += escape(new RGBColorFormat(pattern).getAsString(color));
+          destination += escape(new TrColorConverter(pattern).getAsString(color));
       }
     }
     catch (e)
@@ -308,7 +308,7 @@
   }
 
   var allowsTransparent = _cfts[nameInForm];
-  if (allowsTransparent != (void 0))
+  if (allowsTransparent != null)
   {
     destination += "&allowsTransparent=" + allowsTransparent;
   }
@@ -327,7 +327,7 @@
                              'colorDialog',
                              {width:430, height:230},
                              true,
-                             void 0,
+                             null,
                              _returnColorPickerValue);
   
   // save the date field on the calendar window for access

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFieldFormat.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFieldFormat.js?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFieldFormat.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFieldFormat.js Thu Oct 26 15:42:18 2006
@@ -22,10 +22,10 @@
     var format = _cfs[name];
     var trans  = _cfts[name];
     if (format || trans)
-      return new RGBColorFormat(format, trans);
+      return new TrColorConverter(format, trans);
   }
 
-  return new RGBColorFormat();
+  return new TrColorConverter();
 }
 
 function _fixCFF(

Modified: incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js
URL: http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js?view=diff&rev=468175&r1=468174&r2=468175
==============================================================================
--- incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js (original)
+++ incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/ColorFormat.js Thu Oct 26 15:42:18 2006
@@ -20,122 +20,6 @@
 
 var _cfTrans;
 
-function _rgbColorFormat(
-  formatColor)
-{
-  //pu: Return undefined string for an undefined Color.
-  if (formatColor == null)
-    return null;
-
-  // return localized transparent text for transparent color
-  if (formatColor.alpha == 0)
-    return _cfTrans;
-
-  var stringHolder = new Object();
-  stringHolder.value ="";
-  
-  var pattern = this._pattern;
-  if (typeof pattern != "string")
-    pattern = pattern[0];
-    
-  _cfoDoClumping(pattern,
-              _cfoSubformat,
-              formatColor,
-              stringHolder);
-  
-  return stringHolder.value;
-}
-
-
-/**
- * Parses a String into a Color using the current object's pattern.  If the
- * parsing fails, undefined will be returned.
- */
-function _rgbColorParse(
-  parseString,
-  label)
-{
-  // The following are from the javadoc for Number and DateTimeConverter, same applies to color....
-  // If the specified String is null, return a null. Otherwise, trim leading and trailing whitespace before proceeding.
-  // If the specified String - after trimming - has a zero length, return null.
-  if (parseString == null)
-    return null;
-    
-  parseString = TrUIUtils.trim(parseString);
-  if (parseString.length == 0)
-    return null
-
-  // return transparent color for localized transparent text
-  if (this._allowsTransparent && _cfTrans == parseString)
-    return new Color(0,0,0,0);
-     
-  var facesMessage = _createFacesMessage( this._msg_summary,
-                                          this._msg_detail,
-                                          label,
-                                          parseString,
-                                          this._patternsString);
-  
-  var pattern = this._pattern;                                       
-  if (typeof pattern == "string")
-  {
-    return _rgbColorParseImpl(parseString,
-                              pattern,
-                              facesMessage);
-  }
-  else
-  { 
-    var i;
-    for (i = 0; i < pattern.length; i++)
-    {
-      try{
-        var color = _rgbColorParseImpl(parseString,
-                                     pattern[i],
-                                     facesMessage);
-        return color;
-      }
-      catch (e)
-      {
-        // if we're not on the last pattern try the next one, 
-        // but if we're on the last pattern, throw the exception
-        if ( i == pattern.length-1)
-          throw e;
-      }
-    }
-  }
-}
-
-function _rgbColorParseImpl(
-  parseString,
-  parsePattern,
-  msg)
-{
-  var parseContext = new Object();
-  parseContext.currIndex = 0;
-  parseContext.parseString = parseString;
-  parseContext.parseException = new TrConverterException(msg);
-  
-  var parsedColor = new Color(0x00, 0x00, 0x00);
-
-  // parse the color
-  if (_cfoDoClumping(parsePattern,
-                  _cfoSubParse,
-                  parseContext,
-                  parsedColor))
-  {
-    if (parseString.length != parseContext.currIndex)
-    {
-      throw parseContext.parseException;
-    }
-
-    return parsedColor;
-  }
-  else
-  {
-    // failure
-    throw parseContext.parseException;
-  }
-}
-
 
 /**
  * Clump up similar runs of pattern characters from the format patter and
@@ -566,9 +450,9 @@
 }
 
 /**
- * Construct a RGBColorFormat with the specifed color pattern.
+ * Construct a TrColorConverter with the specifed color pattern.
  */
-function RGBColorFormat(
+function TrColorConverter(
   pattern,
   allowsTransparent,
   msg_summary,
@@ -576,7 +460,7 @@
   patternsString)
 {
   // for debugging
-  this._class = "RGBColorFormat";
+  this._class = "TrColorConverter";
   this._allowsTransparent = allowsTransparent;  
   this._msg_summary = msg_summary; 
   this._msg_detail = msg_detail;
@@ -591,18 +475,130 @@
   this._pattern = pattern;
 }
 
-RGBColorFormat.prototype = new TrConverter();
-RGBColorFormat.prototype.getAsString = _rgbColorFormat;
-RGBColorFormat.prototype.getAsObject  = _rgbColorParse;
+TrColorConverter.prototype = new TrConverter();
+TrColorConverter.prototype.getAsString = function(
+  formatColor)
+{
+  //pu: Return undefined string for an undefined Color.
+  if (formatColor == null)
+    return null;
+
+  // return localized transparent text for transparent color
+  if (formatColor.alpha == 0)
+    return _cfTrans;
+
+  var stringHolder = new Object();
+  stringHolder.value ="";
+  
+  var pattern = this._pattern;
+  if (typeof pattern != "string")
+    pattern = pattern[0];
+    
+  _cfoDoClumping(pattern,
+              _cfoSubformat,
+              formatColor,
+              stringHolder);
+  
+  return stringHolder.value;
+}
 
-function Color(
+/**
+ * Parses a String into a Color using the current object's pattern.  If the
+ * parsing fails, undefined will be returned.
+ */
+TrColorConverter.prototype.getAsObject  = function(
+  parseString,
+  label)
+{
+  // The following are from the javadoc for Number and DateTimeConverter, same applies to color....
+  // If the specified String is null, return a null. Otherwise, trim leading and trailing whitespace before proceeding.
+  // If the specified String - after trimming - has a zero length, return null.
+  if (parseString == null)
+    return null;
+    
+  parseString = TrUIUtils.trim(parseString);
+  if (parseString.length == 0)
+    return null
+
+  // return transparent color for localized transparent text
+  if (this._allowsTransparent && _cfTrans == parseString)
+    return new TrColor(0,0,0,0);
+     
+  var facesMessage = _createFacesMessage( this._msg_summary,
+                                          this._msg_detail,
+                                          label,
+                                          parseString,
+                                          this._patternsString);
+  
+  var pattern = this._pattern;                                       
+  if (typeof pattern == "string")
+  {
+    return this._rgbColorParseImpl(parseString,
+                              pattern,
+                              facesMessage);
+  }
+  else
+  { 
+    var i;
+    for (i = 0; i < pattern.length; i++)
+    {
+      try{
+        var color = this._rgbColorParseImpl(parseString,
+                                     pattern[i],
+                                     facesMessage);
+        return color;
+      }
+      catch (e)
+      {
+        // if we're not on the last pattern try the next one, 
+        // but if we're on the last pattern, throw the exception
+        if ( i == pattern.length-1)
+          throw e;
+      }
+    }
+  }
+}
+
+TrColorConverter.prototype._rgbColorParseImpl  = function(
+  parseString,
+  parsePattern,
+  msg)
+{
+  var parseContext = new Object();
+  parseContext.currIndex = 0;
+  parseContext.parseString = parseString;
+  parseContext.parseException = new TrConverterException(msg);
+  
+  var parsedColor = new TrColor(0x00, 0x00, 0x00);
+
+  // parse the color
+  if (_cfoDoClumping(parsePattern,
+                  _cfoSubParse,
+                  parseContext,
+                  parsedColor))
+  {
+    if (parseString.length != parseContext.currIndex)
+    {
+      throw parseContext.parseException;
+    }
+
+    return parsedColor;
+  }
+  else
+  {
+    // failure
+    throw parseContext.parseException;
+  }
+}
+
+function TrColor(
   red,
   green,
   blue,
   alpha)
 {
   // for debugging
-  this._class = "Color";
+  this._class = "TrColor";
   
   if (alpha == null)
     alpha = 0xff;
@@ -613,13 +609,10 @@
   this.alpha = (alpha & 0xff);
 }
 
-function _Color_toString()
+TrColor.prototype.toString = function()
 {
   return "rgba(" + this.red + 
          "," + this.green + 
          "," + this.blue + 
          "," + this.alpha + ")";
-}
-
-Color.prototype.toString = _Color_toString;
-
+}
\ No newline at end of file



Mime
View raw message