You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2012/05/17 14:05:27 UTC
svn commit: r1339561 - in
/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command:
add/ checkin/ diff/ edit/ status/ unedit/ update/
Author: rfscholte
Date: Thu May 17 12:05:27 2012
New Revision: 1339561
URL: http://svn.apache.org/viewvc?rev=1339561&view=rev
Log:
Use java5 for loops
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java
maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java?rev=1339561&r1=1339560&r2=1339561&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/add/JazzAddCommand.java Thu May 17 12:05:27 2012
@@ -35,7 +35,6 @@ import org.apache.maven.scm.provider.jaz
import java.io.File;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
// RTC does not have the equivalent of the "add" goal. The closest we have is the "share" command, however
@@ -121,9 +120,8 @@ public class JazzAddCommand
StatusScmResult statusCmdResult = statusCmd.executeStatusCommand( repo, fileSet );
List<ScmFile> statusScmFiles = statusCmdResult.getChangedFiles();
- for ( Iterator<ScmFile> it = statusScmFiles.iterator(); it.hasNext(); )
+ for ( ScmFile file : statusScmFiles )
{
- ScmFile file = (ScmFile) it.next();
getLogger().debug( "Iterating over statusScmFiles: " + file );
if ( file.getStatus() == ScmFileStatus.ADDED ||
file.getStatus() == ScmFileStatus.DELETED ||
@@ -143,11 +141,11 @@ public class JazzAddCommand
else
{
// Or commit specific files
- for ( int i = 0; i < files.size(); i++ )
+ for ( File file : files )
{
- if ( fileExistsInFileList( (File) ( files.get( i ) ), changedFiles ) )
+ if ( fileExistsInFileList( file, changedFiles ) )
{
- commitedFiles.add( new ScmFile( ( (File) files.get( i ) ).getPath(), ScmFileStatus.CHECKED_IN ) );
+ commitedFiles.add( new ScmFile( file.getPath(), ScmFileStatus.CHECKED_IN ) );
}
}
}
@@ -176,10 +174,8 @@ public class JazzAddCommand
List<File> files = fileSet.getFileList();
if ( files != null && !files.isEmpty() )
{
- Iterator<File> it = files.iterator();
- while ( it.hasNext() )
+ for( File file : files )
{
- File file = (File) it.next();
command.addArgument( file.getPath() ); // Check in only the files specified
}
}
@@ -194,9 +190,8 @@ public class JazzAddCommand
private boolean fileExistsInFileList( File file, List<File> fileList )
{
boolean exists = false;
- for ( Iterator<File> it = fileList.iterator(); it.hasNext(); )
+ for ( File changedFile : fileList )
{
- File changedFile = (File) it.next();
if ( changedFile.compareTo( file ) == 0 )
{
exists = true;
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java?rev=1339561&r1=1339560&r2=1339561&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/checkin/JazzCheckInCommand.java Thu May 17 12:05:27 2012
@@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmVersion;
@@ -35,10 +38,6 @@ import org.apache.maven.scm.provider.jaz
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.StreamConsumer;
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
// The Maven SCM Plugin "checkin" goal is equivalent to the RTC "checkin" command.
//
// This implementation of the Maven SCM Plugin "checkin" goal creates a change set with the message provided.
@@ -183,10 +182,8 @@ public class JazzCheckInCommand
List<File> files = fileSet.getFileList();
if ( files != null && !files.isEmpty() )
{
- Iterator<File> it = files.iterator();
- while ( it.hasNext() )
+ for ( File file : files )
{
- File file = (File) it.next();
command.addArgument( file.getPath() ); // Check in only the files specified
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java?rev=1339561&r1=1339560&r2=1339561&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/diff/JazzDiffCommand.java Thu May 17 12:05:27 2012
@@ -19,6 +19,11 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
@@ -34,12 +39,6 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
import org.apache.maven.scm.provider.jazz.command.status.JazzStatusCommand;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
// The Maven SCM plugin "diff" goal may have different interpretations in RTC depending on how
// the user is using RTC. In one instance, the user may expect the diff to report back on the differences between
// the local 'sandbox' and their connected repository workspace (ie. What files are 'unresolved').
@@ -121,9 +120,8 @@ public class JazzDiffCommand
Map<String, CharSequence> differences = new HashMap<String, CharSequence>();
// Now lets iterate through them
- for ( Iterator<ScmFile> it = statusScmFiles.iterator(); it.hasNext(); )
+ for ( ScmFile file : statusScmFiles )
{
- ScmFile file = (ScmFile) it.next();
if ( file.getStatus() == ScmFileStatus.MODIFIED )
{
// The "scm status" command returns files relative to the sandbox root.
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java?rev=1339561&r1=1339560&r2=1339561&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/edit/JazzEditCommand.java Thu May 17 12:05:27 2012
@@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -30,10 +33,6 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.consumer.DebugLoggerConsumer;
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
// In RTC the need to 'edit' or 'lock' a file is not required. It is actually encouraged to not
// lock 'text' based files and to only lock binary file types.
//
@@ -97,10 +96,8 @@ public class JazzEditCommand
List<File> files = fileSet.getFileList();
if ( files != null && !files.isEmpty() )
{
- Iterator<File> it = files.iterator();
- while ( it.hasNext() )
+ for ( File file : files )
{
- File file = (File) it.next();
command.addArgument( file.getPath() ); // Lock only the files specified
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java?rev=1339561&r1=1339560&r2=1339561&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/status/JazzStatusCommand.java Thu May 17 12:05:27 2012
@@ -29,8 +29,6 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.JazzScmCommand;
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
-import java.util.Iterator;
-
//
// See the following links for additional information on the RTC "status" command:
// RTC 2.0.0.2:
@@ -72,13 +70,11 @@ public class JazzStatusCommand
if ( getLogger().isDebugEnabled() )
{
- Iterator<ScmFile> iter = statusConsumer.getChangedFiles().iterator();
- if ( iter.hasNext() )
+ if ( !statusConsumer.getChangedFiles().isEmpty() )
{
getLogger().debug( "Iterating over \"Status\" results" );
- while ( iter.hasNext() )
+ for ( ScmFile file : statusConsumer.getChangedFiles() )
{
- ScmFile file = (ScmFile) iter.next();
getLogger().debug( file.getPath() + " : " + file.getStatus() );
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java?rev=1339561&r1=1339560&r2=1339561&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/unedit/JazzUnEditCommand.java Thu May 17 12:05:27 2012
@@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.ja
* under the License.
*/
+import java.io.File;
+import java.util.List;
+
import org.apache.maven.scm.ScmException;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
@@ -30,10 +33,6 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.consumer.DebugLoggerConsumer;
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
// In RTC the need to 'edit' or 'lock' a file is not required. It is actually encouraged to not
// lock 'text' based files and to only lock binary file types.
//
@@ -98,10 +97,8 @@ public class JazzUnEditCommand
List<File> files = fileSet.getFileList();
if ( files != null && !files.isEmpty() )
{
- Iterator<File> it = files.iterator();
- while ( it.hasNext() )
+ for ( File file : files )
{
- File file = (File) it.next();
command.addArgument( file.getPath() ); // Un-Lock only the files specified
}
}
Modified: maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java?rev=1339561&r1=1339560&r2=1339561&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java (original)
+++ maven/scm/trunk/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/update/JazzUpdateCommand.java Thu May 17 12:05:27 2012
@@ -32,8 +32,6 @@ import org.apache.maven.scm.provider.jaz
import org.apache.maven.scm.provider.jazz.command.changelog.JazzChangeLogCommand;
import org.apache.maven.scm.provider.jazz.command.consumer.ErrorConsumer;
-import java.util.Iterator;
-
//
// The Maven SCM Plugin "update" goal is equivalent to the RTC "accept" command.
//
@@ -84,13 +82,11 @@ public class JazzUpdateCommand
if ( getLogger().isDebugEnabled() )
{
- Iterator<ScmFile> iter = updateConsumer.getUpdatedFiles().iterator();
- if ( iter.hasNext() )
+ if ( !updateConsumer.getUpdatedFiles().isEmpty() )
{
getLogger().debug( "Iterating over \"Update\" results" );
- while ( iter.hasNext() )
+ for ( ScmFile file : updateConsumer.getUpdatedFiles() )
{
- ScmFile file = (ScmFile) iter.next();
getLogger().debug( file.getPath() + " : " + file.getStatus() );
}
}