You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/11/16 00:18:28 UTC
svn commit: r1202468 -
/myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
Author: lu4242
Date: Tue Nov 15 23:18:27 2011
New Revision: 1202468
URL: http://svn.apache.org/viewvc?rev=1202468&view=rev
Log:
MYFACES-3368 enable 'standard' checkstyle checks in myfaces-core (revert change over NumberConverter that causes TCK fail)
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/convert/NumberConverter.java
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=1202468&r1=1202467&r2=1202468&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 Tue Nov 15 23:18:27 2011
@@ -590,28 +590,29 @@ public class NumberConverter
byte value = Byte.parseByte(version.substring(0, 1));
version = version.substring(idx + 1, version.length());
idx = version.indexOf('.');
- if (i == 0)
+ switch (i)
{
- if (value == 1)
- {
- java14 = 1;
+ case 0:
+ if (value == 1)
+ {
+ java14 = 1;
+ break;
+ }
+ else if (value > 1)
+ {
+ java14 = 2;
+ }
+ case 1:
+ if (java14 > 0 && value >= 4)
+ {
+ java14 = 2;
+ }
+ ;
+ default:
+ idx = 0;
+ version = null;
break;
- }
- else if (value > 1)
- {
- java14 = 2;
- }
}
- if (i <=1)
- {
- if (java14 > 0 && value >= 4)
- {
- java14 = 2;
- }
- }
-
- idx = 0;
- version = null;
}
else
{