svn commit: r1243400 - in /commons/proper/net/trunk: findbugs-exclude-filter.xml src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java

[sebb]

Author: sebb
Date: Mon Feb 13 03:02:29 2012
New Revision: 1243400

URL: http://svn.apache.org/viewvc?rev=1243400&view=rev
Log:
Eliminate drop-thru cases

Modified:
    commons/proper/net/trunk/findbugs-exclude-filter.xml
    
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
    
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java

Modified: commons/proper/net/trunk/findbugs-exclude-filter.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/findbugs-exclude-filter.xml?rev=1243400&r1=1243399&r2=1243400&view=diff
==============================================================================
--- commons/proper/net/trunk/findbugs-exclude-filter.xml (original)
+++ commons/proper/net/trunk/findbugs-exclude-filter.xml Mon Feb 13 03:02:29 
2012
@@ -49,13 +49,6 @@
     <Bug code="BC" />
   </Match>
 
-  <!-- Switch fallthrough is deliberate -->
-  <Match>
-    <Class name="org.apache.commons.net.ftp.parser.UnixFTPEntryParser" />
-    <Method name="parseFTPEntry" />
-    <Bug code="SF" />
-  </Match>
-
   <!-- False positive - missing default -->
   <Match>
     <Class name="org.apache.commons.net.io.DotTerminatedMessageWriter" />

Modified: 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java?rev=1243400&r1=1243399&r2=1243400&view=diff
==============================================================================
--- 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
 (original)
+++ 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/MacOsPeterFTPEntryParser.java
 Mon Feb 13 03:02:29 2012
@@ -169,8 +169,8 @@ public class MacOsPeterFTPEntryParser ex
             case 'b':
             case 'c':
                 isDevice = true;
-                // break; - fall through
-                //$FALL-THROUGH$ TODO change this if DEVICE_TYPE implemented
+                type = FTPFile.FILE_TYPE; // TODO change this if DEVICE_TYPE 
implemented
+                break;
             case 'f':
             case '-':
                 type = FTPFile.FILE_TYPE;

Modified: 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java?rev=1243400&r1=1243399&r2=1243400&view=diff
==============================================================================
--- 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
 (original)
+++ 
commons/proper/net/trunk/src/main/java/org/apache/commons/net/ftp/parser/UnixFTPEntryParser.java
 Mon Feb 13 03:02:29 2012
@@ -208,8 +208,8 @@ public class UnixFTPEntryParser extends 
             case 'b':
             case 'c':
                 isDevice = true;
-                // break; - fall through
-                //$FALL-THROUGH$ TODO change this if DEVICE_TYPE implemented
+                type = FTPFile.FILE_TYPE; // TODO change this if DEVICE_TYPE 
implemented
+                break;
             case 'f':
             case '-':
                 type = FTPFile.FILE_TYPE;