From: <cr...@us...> - 2008-06-07 23:47:35
|
Revision: 4212 http://jnode.svn.sourceforge.net/jnode/?rev=4212&view=rev Author: crawley Date: 2008-06-07 16:47:31 -0700 (Sat, 07 Jun 2008) Log Message: ----------- Tweak code to work around CheckStyle crashes Modified Paths: -------------- trunk/all/build.xml trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java Modified: trunk/all/build.xml =================================================================== --- trunk/all/build.xml 2008-06-07 23:44:34 UTC (rev 4211) +++ trunk/all/build.xml 2008-06-07 23:47:31 UTC (rev 4212) @@ -891,10 +891,7 @@ <fileset dir="../gui/src/desktop" includes="**/*.java"/> <fileset dir="../gui/src/awt" includes="**/*.java"/> <fileset dir="../shell/src/test" includes="**/*.java"/> - <!-- todo: the two excluded files make checkstyle fail, investigate it! --> - <fileset dir="../shell/src/shell" - includes="**/*.java" - excludes="**/BjorneContext.java,**/BjorneTokenizer.java"/> + <fileset dir="../shell/src/shell" includes="**/*.java"/> </checkstyle> </target> Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2008-06-07 23:44:34 UTC (rev 4211) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneContext.java 2008-06-07 23:47:31 UTC (rev 4212) @@ -425,6 +425,7 @@ break; default: sb = accumulate(sb, ch); + break; } } if (sb != null) { @@ -513,6 +514,7 @@ default: sb.append((char) ch); + break; } ch = ci.nextCh(); } @@ -597,6 +599,8 @@ } break; default: + // Nothing to do + break; } if (ch != -1) { sb.append((char) ch); @@ -632,6 +636,7 @@ break LOOP; default: // Include this in the parameter name for now. + break; } } @@ -693,6 +698,7 @@ break; default: i++; + break; } // Extract the word if (i >= sb.length()) { @@ -877,6 +883,7 @@ break; default: fd = 1; + break; } } else { try { Modified: trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java =================================================================== --- trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java 2008-06-07 23:44:34 UTC (rev 4211) +++ trunk/shell/src/shell/org/jnode/shell/bjorne/BjorneTokenizer.java 2008-06-07 23:47:31 UTC (rev 4212) @@ -232,6 +232,7 @@ break; default: /* empty */ + break; } sb.append((char) ch); ch = nextCh(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |