Various language level fixes

Author: krosenvold

src/main/java/org/codehaus/plexus/util/Base64.java

@@ -186,8 +186,10 @@ public static boolean isArrayByteBase64(byte[] arrayOctect) {
  // return false;
  return true;
  }
- for (int i = 0; i < length; i++) {
- if (!isBase64(arrayOctect[i])) {
+ for ( byte anArrayOctect : arrayOctect )
+ {
+ if ( !isBase64( anArrayOctect ) )
+ {
  return false;
  }
  }
@@ -450,15 +452,17 @@ static byte[] discardWhitespace(byte[] data) {
  byte groomedData[] = new byte[data.length];
  int bytesCopied = 0;
 
- for (int i = 0; i < data.length; i++) {
- switch (data[i]) {
- case (byte) ' ' :
- case (byte) '\n' :
- case (byte) '\r' :
- case (byte) '\t' :
+ for ( byte aData : data )
+ {
+ switch ( aData )
+ {
+ case (byte) ' ':
+ case (byte) '\n':
+ case (byte) '\r':
+ case (byte) '\t':
  break;
- default:
- groomedData[bytesCopied++] = data[i];
+  default:
+ groomedData[bytesCopied++] = aData;
  }
  }
 
@@ -482,9 +486,11 @@ static byte[] discardNonBase64(byte[] data) {
  byte groomedData[] = new byte[data.length];
  int bytesCopied = 0;
 
- for (int i = 0; i < data.length; i++) {
- if (isBase64(data[i])) {
- groomedData[bytesCopied++] = data[i];
+ for ( byte aData : data )
+ {
+ if ( isBase64( aData ) )
+ {
+ groomedData[bytesCopied++] = aData;
  }
  }
 

src/main/java/org/codehaus/plexus/util/CachedMap.java

@@ -126,9 +126,9 @@ public CachedMap(int cacheSize, Map backingMap) {
  _backingFastMap = null;
  _backingMap = backingMap;
  _keysMap = new FastMap(backingMap.size());
- for (Iterator i= backingMap.keySet().iterator(); i.hasNext();) {
-  Object key = i.next();
- _keysMap.put(key, key);
+ for ( Object key : backingMap.keySet() )
+ {
+ _keysMap.put( key, key );
  }
  }
  }
@@ -165,9 +165,9 @@ public void flush() {
 
  if (_keysMap != null) {
  // Re-populates keys from backing map.
- for (Iterator i= _backingMap.keySet().iterator(); i.hasNext();) {
-  Object key = i.next();
- _keysMap.put(key, key);
+ for ( Object key : _backingMap.keySet() )
+ {
+ _keysMap.put( key, key );
  }
  }
  }

src/main/java/org/codehaus/plexus/util/DirectoryWalker.java

@@ -119,36 +119,36 @@ public String toString()
 
  private Stack dirStack;
 
- private List excludes;
+ private List<String> excludes;
 
- private List includes;
+ private List<String> includes;
 
  private boolean isCaseSensitive = true;
 
- private List listeners;
+ private List<DirectoryWalkListener> listeners;
 
  private boolean debugEnabled = false;
 
  public DirectoryWalker()
  {
- this.includes = new ArrayList();
- this.excludes = new ArrayList();
- this.listeners = new ArrayList();
+ includes = new ArrayList<String>();
+ excludes = new ArrayList<String>();
+ listeners = new ArrayList<DirectoryWalkListener>();
  }
 
  public void addDirectoryWalkListener( DirectoryWalkListener listener )
  {
- this.listeners.add( listener );
+ listeners.add( listener );
  }
 
  public void addExclude( String exclude )
  {
- this.excludes.add( fixPattern( exclude ) );
+ excludes.add( fixPattern( exclude ) );
  }
 
  public void addInclude( String include )
  {
- this.includes.add( fixPattern( include ) );
+ includes.add( fixPattern( include ) );
  }
 
  /**
@@ -157,51 +157,44 @@ public void addInclude( String include )
  public void addSCMExcludes()
  {
  String scmexcludes[] = DirectoryScanner.DEFAULTEXCLUDES;
- for ( int i = 0; i < scmexcludes.length; i++ )
+ for ( String scmexclude : scmexcludes )
  {
- addExclude( scmexcludes[i] );
+ addExclude( scmexclude );
  }
  }
 
  private void fireStep( File file )
  {
  DirStackEntry dsEntry = (DirStackEntry) dirStack.peek();
  int percentage = dsEntry.getPercentage();
- Iterator it = this.listeners.iterator();
- while ( it.hasNext() )
+ for ( Object listener1 : listeners )
  {
- DirectoryWalkListener listener = (DirectoryWalkListener) it.next();
+ DirectoryWalkListener listener = (DirectoryWalkListener) listener1;
  listener.directoryWalkStep( percentage, file );
  }
  }
 
  private void fireWalkFinished()
  {
- Iterator it = this.listeners.iterator();
- while ( it.hasNext() )
+ for ( DirectoryWalkListener listener1 : listeners )
  {
- DirectoryWalkListener listener = (DirectoryWalkListener) it.next();
- listener.directoryWalkFinished();
+ listener1.directoryWalkFinished();
  }
  }
 
  private void fireWalkStarting()
  {
- Iterator it = this.listeners.iterator();
- while ( it.hasNext() )
+ for ( DirectoryWalkListener listener1 : listeners )
  {
- DirectoryWalkListener listener = (DirectoryWalkListener) it.next();
- listener.directoryWalkStarting( this.baseDir );
+ listener1.directoryWalkStarting( baseDir );
  }
  }
 
  private void fireDebugMessage( String message )
  {
- Iterator it = this.listeners.iterator();
- while ( it.hasNext() )
+ for ( DirectoryWalkListener listener1 : listeners )
  {
- DirectoryWalkListener listener = (DirectoryWalkListener) it.next();
- listener.debug( message );
+ listener1.debug( message );
  }
  }
 
@@ -238,36 +231,34 @@ public File getBaseDir()
  /**
  * @return Returns the excludes.
  */
- public List getExcludes()
+ public List<String> getExcludes()
  {
  return excludes;
  }
 
  /**
  * @return Returns the includes.
  */
- public List getIncludes()
+ public List<String> getIncludes()
  {
  return includes;
  }
 
  private boolean isExcluded( String name )
  {
- return isMatch( this.excludes, name );
+ return isMatch( excludes, name );
  }
 
  private boolean isIncluded( String name )
  {
- return isMatch( this.includes, name );
+ return isMatch( includes, name );
  }
 
- private boolean isMatch( List patterns, String name )
+ private boolean isMatch( List<String> patterns, String name )
  {
- Iterator it = patterns.iterator();
- while ( it.hasNext() )
+ for ( String pattern1 : patterns )
  {
- String pattern = (String) it.next();
- if ( SelectorUtils.matchPath( pattern, name, isCaseSensitive ) )
+ if ( SelectorUtils.matchPath( pattern1, name, isCaseSensitive ) )
  {
  return true;
  }
@@ -288,7 +279,7 @@ private String relativeToBaseDir( File file )
  */
  public void removeDirectoryWalkListener( DirectoryWalkListener listener )
  {
- this.listeners.remove( listener );
+ listeners.remove( listener );
  }
 
  /**
@@ -311,44 +302,44 @@ public void scan()
  throw new IllegalStateException( "Scan Failure. BaseDir is not a directory." );
  }
 
- if ( this.includes.isEmpty() )
+ if ( includes.isEmpty() )
  {
  // default to include all.
  addInclude( "**" );
  }
 
  if ( debugEnabled )
  {
- Iterator it;
+ Iterator<String> it;
  StringBuilder dbg = new StringBuilder();
  dbg.append( "DirectoryWalker Scan" );
- dbg.append( "\n Base Dir: " ).append( this.baseDir.getAbsolutePath() );
+ dbg.append( "\n Base Dir: " ).append( baseDir.getAbsolutePath() );
  dbg.append( "\n Includes: " );
- it = this.includes.iterator();
+ it = includes.iterator();
  while ( it.hasNext() )
  {
- String include = (String) it.next();
+ String include = it.next();
  dbg.append( "\n - \"" ).append( include ).append( "\"" );
  }
  dbg.append( "\n Excludes: " );
- it = this.excludes.iterator();
+ it = excludes.iterator();
  while ( it.hasNext() )
  {
- String exclude = (String) it.next();
+ String exclude = it.next();
  dbg.append( "\n - \"" ).append( exclude ).append( "\"" );
  }
  fireDebugMessage( dbg.toString() );
  }
 
  fireWalkStarting();
  dirStack = new Stack();
- scanDir( this.baseDir );
+ scanDir( baseDir );
  fireWalkFinished();
  }
 
  private void scanDir( File dir )
  {
- File files[] = dir.listFiles();
+ File[] files = dir.listFiles();
 
  if ( files == null )
  {
@@ -403,39 +394,36 @@ private void scanDir( File dir )
  public void setBaseDir( File baseDir )
  {
  this.baseDir = baseDir;
- this.baseDirOffset = baseDir.getAbsolutePath().length();
+ baseDirOffset = baseDir.getAbsolutePath().length();
  }
 
  /**
  * @param entries The excludes to set.
  */
  public void setExcludes( List entries )
  {
- this.excludes.clear();
+ excludes.clear();
  if ( entries != null )
  {
- Iterator it = entries.iterator();
- while ( it.hasNext() )
+ for ( Object entry : entries )
  {
- String pattern = (String) it.next();
- this.excludes.add( fixPattern( pattern ) );
+ String pattern = (String) entry;
+ excludes.add( fixPattern( pattern ) );
  }
  }
  }
 
  /**
  * @param entries The includes to set.
  */
- public void setIncludes( List entries )
+ public void setIncludes( List<String> entries )
  {
- this.includes.clear();
+ includes.clear();
  if ( entries != null )
  {
- Iterator it = entries.iterator();
- while ( it.hasNext() )
+ for ( String entry : entries )
  {
- String pattern = (String) it.next();
- this.includes.add( fixPattern( pattern ) );
+ includes.add( fixPattern( entry ) );
  }
  }
  }