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/10/27 16:51:10 UTC
svn commit: r1189793 - in /myfaces/core/trunk/api/src/main/java/javax/faces:
component/ validator/
Author: struberg
Date: Thu Oct 27 14:51:09 2011
New Revision: 1189793
URL: http://svn.apache.org/viewvc?rev=1189793&view=rev
Log:
MYFACES-3368 fix codestyle and add hashCode where necessary
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.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
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java?rev=1189793&r1=1189792&r2=1189793&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIComponentBase.java Thu Oct 27 14:51:09 2011
@@ -812,7 +812,7 @@ public abstract class UIComponentBase ex
String containerClientId = namingContainer.getContainerClientId(context);
if (containerClientId != null)
{
- StringBuilder bld = __getSharedStringBuilder(context);
+ StringBuilder bld = _getSharedStringBuilder(context);
_clientId = bld.append(containerClientId).append(
UINamingContainer.getSeparatorChar(context)).append(id).toString();
}
@@ -2234,27 +2234,27 @@ public abstract class UIComponentBase ex
/**
* <p>
* This gets a single FacesContext-local shared stringbuilder instance, each time you call
- * __getSharedStringBuilder it sets the length of the stringBuilder instance to 0.
+ * _getSharedStringBuilder it sets the length of the stringBuilder instance to 0.
* </p><p>
* This allows you to use the same StringBuilder instance over and over.
- * You must call toString on the instance before calling __getSharedStringBuilder again.
+ * You must call toString on the instance before calling _getSharedStringBuilder again.
* </p>
* Example that works
* <pre><code>
- * StringBuilder sb1 = __getSharedStringBuilder();
+ * StringBuilder sb1 = _getSharedStringBuilder();
* sb1.append(a).append(b);
* String c = sb1.toString();
*
- * StringBuilder sb2 = __getSharedStringBuilder();
+ * StringBuilder sb2 = _getSharedStringBuilder();
* sb2.append(b).append(a);
* String d = sb2.toString();
* </code></pre>
* <br><br>
* Example that doesn't work, you must call toString on sb1 before
- * calling __getSharedStringBuilder again.
+ * calling _getSharedStringBuilder again.
* <pre><code>
- * StringBuilder sb1 = __getSharedStringBuilder();
- * StringBuilder sb2 = __getSharedStringBuilder();
+ * StringBuilder sb1 = _getSharedStringBuilder();
+ * StringBuilder sb2 = _getSharedStringBuilder();
*
* sb1.append(a).append(b);
* String c = sb1.toString();
@@ -2264,13 +2264,13 @@ public abstract class UIComponentBase ex
* </code></pre>
*
*/
- static StringBuilder __getSharedStringBuilder()
+ static StringBuilder _getSharedStringBuilder()
{
- return __getSharedStringBuilder(FacesContext.getCurrentInstance());
+ return _getSharedStringBuilder(FacesContext.getCurrentInstance());
}
// TODO checkstyle complains; does this have to lead with __ ?
- static StringBuilder __getSharedStringBuilder(FacesContext facesContext)
+ static StringBuilder _getSharedStringBuilder(FacesContext facesContext)
{
Map<Object, Object> attributes = facesContext.getAttributes();
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java?rev=1189793&r1=1189792&r2=1189793&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIData.java Thu Oct 27 14:51:09 2011
@@ -1529,7 +1529,7 @@ public class UIData extends UIComponentB
return clientId;
}
- StringBuilder bld = __getSharedStringBuilder();
+ StringBuilder bld = _getSharedStringBuilder();
return bld.append(clientId).append(UINamingContainer.getSeparatorChar(context)).append(rowIndex).toString();
}*/
@@ -1545,7 +1545,7 @@ public class UIData extends UIComponentB
return clientId;
}
- StringBuilder bld = __getSharedStringBuilder(context);
+ StringBuilder bld = _getSharedStringBuilder(context);
return bld.append(clientId).append(UINamingContainer.getSeparatorChar(context)).append(rowIndex).toString();
}
@@ -1619,7 +1619,7 @@ public class UIData extends UIComponentB
*/
public String createUniqueId(FacesContext context, String seed)
{
- StringBuilder bld = __getSharedStringBuilder(context);
+ StringBuilder bld = _getSharedStringBuilder(context);
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java?rev=1189793&r1=1189792&r2=1189793&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIForm.java Thu Oct 27 14:51:09 2011
@@ -85,7 +85,7 @@ public class UIForm extends UIComponentB
}
else
{
- bld = __getSharedStringBuilder(context);
+ bld = _getSharedStringBuilder(context);
}
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java?rev=1189793&r1=1189792&r2=1189793&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UINamingContainer.java Thu Oct 27 14:51:09 2011
@@ -71,7 +71,7 @@ public class UINamingContainer extends U
*/
public String createUniqueId(FacesContext context, String seed)
{
- StringBuilder bld = __getSharedStringBuilder(context);
+ StringBuilder bld = _getSharedStringBuilder(context);
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java?rev=1189793&r1=1189792&r2=1189793&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIViewRoot.java Thu Oct 27 14:51:09 2011
@@ -331,7 +331,7 @@ public class UIViewRoot extends UICompon
*/
public String createUniqueId(FacesContext context, String seed)
{
- StringBuilder bld = __getSharedStringBuilder(context);
+ StringBuilder bld = _getSharedStringBuilder(context);
Long uniqueIdCounter = (Long) getStateHelper().get(PropertyKeys.uniqueIdCounter);
uniqueIdCounter = (uniqueIdCounter == null) ? 0 : uniqueIdCounter;
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java?rev=1189793&r1=1189792&r2=1189793&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/BeanValidator.java Thu Oct 27 14:51:09 2011
@@ -480,7 +480,8 @@ final class _FacesMessageInterpolatorHol
if (ret == null)
{
MessageInterpolator interpolator = validatorFactory.getMessageInterpolator();
- instance = ret = new FacesMessageInterpolator(interpolator);
+ ret = new FacesMessageInterpolator(interpolator);
+ instance = ret;
}
return ret;
}
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java?rev=1189793&r1=1189792&r2=1189793&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/validator/DoubleRangeValidator.java Thu Oct 27 14:51:09 2011
@@ -245,6 +245,8 @@ public class DoubleRangeValidator
return true;
}
+
+
private boolean _initialStateMarked = false;
public void clearInitialState()
@@ -273,4 +275,12 @@ public class DoubleRangeValidator
{
return null;
}
+
+ @Override
+ public int hashCode()
+ {
+ int result = _minimum != null ? _minimum.hashCode() : 0;
+ result = 31 * result + (_maximum != null ? _maximum.hashCode() : 0);
+ return result;
+ }
}
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=1189793&r1=1189792&r2=1189793&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 Thu Oct 27 14:51:09 2011
@@ -216,6 +216,14 @@ public class LengthValidator
return true;
}
+ @Override
+ public int hashCode()
+ {
+ int result = _minimum != null ? _minimum.hashCode() : 0;
+ result = 31 * result + (_maximum != null ? _maximum.hashCode() : 0);
+ return result;
+ }
+
private boolean _initialStateMarked = false;
public void 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=1189793&r1=1189792&r2=1189793&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 Thu Oct 27 14:51:09 2011
@@ -244,7 +244,15 @@ public class LongRangeValidator
return true;
}
-
+
+ @Override
+ public int hashCode()
+ {
+ int result = _minimum != null ? _minimum.hashCode() : 0;
+ result = 31 * result + (_maximum != null ? _maximum.hashCode() : 0);
+ return result;
+ }
+
private boolean _initialStateMarked = false;
public void clearInitialState()