You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/03/09 23:41:07 UTC

svn commit: r1080043 - in /myfaces/core/trunk: api/src/main/java/javax/faces/convert/ api/src/main/java/javax/faces/validator/ impl/src/main/java/org/apache/myfaces/view/facelets/component/ impl/src/main/java/org/apache/myfaces/view/facelets/impl/ impl...

Author: struberg
Date: Wed Mar  9 22:41:06 2011
New Revision: 1080043

URL: http://svn.apache.org/viewvc?rev=1080043&view=rev
Log:
MYFACES-3063 use valueOf instead of creating new instances each time

Modified:
    myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java
    myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
    myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java
    myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java?rev=1080043&r1=1080042&r2=1080043&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/CharacterConverter.java Wed Mar  9 22:41:06 2011
@@ -55,7 +55,7 @@ public class CharacterConverter
             if (value.length() > 0)
             {
                 try {
-                    return new Character(value.charAt(0));
+                    return Character.valueOf(value.charAt(0));
                 }catch(Exception e) {
                     throw new ConverterException(_MessageUtils.getErrorMessage(facesContext,
                                                                                 CHARACTER_ID,

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java?rev=1080043&r1=1080042&r2=1080043&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java Wed Mar  9 22:41:06 2011
@@ -317,10 +317,10 @@ public class NumberConverter
             values[0] = _currencyCode;
             values[1] = _currencySymbol;
             values[2] = _locale;
-            values[3] = _maxFractionDigitsSet ? new Integer(_maxFractionDigits) : null;
-            values[4] = _maxIntegerDigitsSet ? new Integer(_maxIntegerDigits) : null;
-            values[5] = _minFractionDigitsSet ? new Integer(_minFractionDigits) : null;
-            values[6] = _minIntegerDigitsSet ? new Integer(_minIntegerDigits) : null;
+            values[3] = _maxFractionDigitsSet ? Integer.valueOf(_maxFractionDigits) : null;
+            values[4] = _maxIntegerDigitsSet ? Integer.valueOf(_maxIntegerDigits) : null;
+            values[5] = _minFractionDigitsSet ? Integer.valueOf(_minFractionDigits) : null;
+            values[6] = _minIntegerDigitsSet ? Integer.valueOf(_minIntegerDigits) : null;
             values[7] = _pattern;
             values[8] = _type;
             values[9] = _groupingUsed ? Boolean.TRUE : Boolean.FALSE;

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java?rev=1080043&r1=1080042&r2=1080043&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/LengthValidator.java Wed Mar  9 22:41:06 2011
@@ -70,14 +70,14 @@ public class LengthValidator
 
     public LengthValidator(int maximum)
     {
-        _maximum = new Integer(maximum);
+        _maximum = Integer.valueOf(maximum);
     }
 
     public LengthValidator(int maximum,
                            int minimum)
     {
-        _maximum = new Integer(maximum);
-        _minimum = new Integer(minimum);
+        _maximum = Integer.valueOf(maximum);
+        _minimum = Integer.valueOf(minimum);
     }
 
     // VALIDATE
@@ -130,7 +130,7 @@ public class LengthValidator
 
     public void setMaximum(int maximum)
     {
-        _maximum = new Integer(maximum);
+        _maximum = Integer.valueOf(maximum);
         clearInitialState();
     }
 
@@ -146,7 +146,7 @@ public class LengthValidator
 
     public void setMinimum(int minimum)
     {
-        _minimum = new Integer(minimum);
+        _minimum = Integer.valueOf(minimum);
         clearInitialState();
     }
 

Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java?rev=1080043&r1=1080042&r2=1080043&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/LongRangeValidator.java Wed Mar  9 22:41:06 2011
@@ -70,14 +70,14 @@ public class LongRangeValidator
 
     public LongRangeValidator(long maximum)
     {
-        _maximum = new Long(maximum);
+        _maximum = Long.valueOf(maximum);
     }
 
     public LongRangeValidator(long maximum,
                               long minimum)
     {
-        _maximum = new Long(maximum);
-        _minimum = new Long(minimum);
+        _maximum = Long.valueOf(maximum);
+        _minimum = Long.valueOf(minimum);
     }
 
     // VALIDATE
@@ -157,7 +157,7 @@ public class LongRangeValidator
 
     public void setMaximum(long maximum)
     {
-        _maximum = new Long(maximum);
+        _maximum = Long.valueOf(maximum);
         clearInitialState();
     }
 

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java?rev=1080043&r1=1080042&r2=1080043&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/component/UIRepeat.java Wed Mar  9 22:41:06 2011
@@ -1130,8 +1130,8 @@ public class UIRepeat extends UIComponen
         Object[] state = new Object[6];
         state[0] = super.saveState(faces);
         state[1] = _childState;
-        state[2] = new Integer(_offset);
-        state[3] = new Integer(_size);
+        state[2] = Integer.valueOf(_offset);
+        state[3] = Integer.valueOf(_size);
         state[4] = _var;
         state[5] = _value;
         return state;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java?rev=1080043&r1=1080042&r2=1080043&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java Wed Mar  9 22:41:06 2011
@@ -281,13 +281,13 @@ final class DefaultFaceletContext extend
             Integer cnt = _prefixes.get(prefixInt);
             if (cnt == null)
             {
-                _prefixes.put(prefixInt, new Integer(0));
+                _prefixes.put(prefixInt, Integer.valueOf(0));
                 _prefix = prefixInt.toString();
             }
             else
             {
                 int i = cnt.intValue() + 1;
-                _prefixes.put(prefixInt, new Integer(i));
+                _prefixes.put(prefixInt, Integer.valueOf(i));
                 _prefix = prefixInt + "_" + i;
             }
         }
@@ -295,7 +295,7 @@ final class DefaultFaceletContext extend
         Integer cnt = _ids.get(base);
         if (cnt == null)
         {
-            _ids.put(base, new Integer(0));
+            _ids.put(base, Integer.valueOf(0));
             _uniqueIdBuilder.delete(0, _uniqueIdBuilder.length());
             _uniqueIdBuilder.append(_prefix);
             _uniqueIdBuilder.append("_");
@@ -305,7 +305,7 @@ final class DefaultFaceletContext extend
         else
         {
             int i = cnt.intValue() + 1;
-            _ids.put(base, new Integer(i));
+            _ids.put(base, Integer.valueOf(i));
             _uniqueIdBuilder.delete(0, _uniqueIdBuilder.length());
             _uniqueIdBuilder.append(_prefix);
             _uniqueIdBuilder.append("_");

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java?rev=1080043&r1=1080042&r2=1080043&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/ForEachHandler.java Wed Mar  9 22:41:06 2011
@@ -169,9 +169,9 @@ public final class ForEachHandler extend
         int s = this.getBegin(ctx);
         int e = this.getEnd(ctx);
         int m = this.getStep(ctx);
-        Integer sO = this.begin != null ? new Integer(s) : null;
-        Integer eO = this.end != null ? new Integer(e) : null;
-        Integer mO = this.step != null ? new Integer(m) : null;
+        Integer sO = this.begin != null ? Integer.valueOf(s) : null;
+        Integer eO = this.end != null ? Integer.valueOf(e) : null;
+        Integer mO = this.step != null ? Integer.valueOf(m) : null;
 
         boolean t = this.getTransient(ctx);
         Object src = null;

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java?rev=1080043&r1=1080042&r2=1080043&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jstl/core/IndexedValueExpression.java Wed Mar  9 22:41:06 2011
@@ -42,7 +42,7 @@ public final class IndexedValueExpressio
      */
     public IndexedValueExpression(ValueExpression orig, int i)
     {
-        this.i = new Integer(i);
+        this.i = Integer.valueOf(i);
         this.orig = orig;
     }