More java5
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1517357 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java b/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
index db6b375..6fa6704 100644
--- a/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
+++ b/src/main/java/org/apache/maven/plugins/stage/DefaultRepositoryCopier.java
@@ -123,7 +123,7 @@
for ( String s : files )
{
- if ( s.indexOf( ".svn" ) >= 0 )
+ if (s.contains(".svn"))
{
continue;
}
@@ -216,13 +216,12 @@
logger.info( "Creating rename script." );
- for ( Iterator i = moveCommands.iterator(); i.hasNext(); )
- {
- String s = (String) i.next();
+ for (Object moveCommand : moveCommands) {
+ String s = (String) moveCommand;
// We use an explicit unix '\n' line-ending here instead of using the println() method.
// Using println() will cause files and folders to have a '\r' at the end if the plugin is run on Windows.
- rw.print( s + "\n" );
+ rw.print(s + "\n");
}
IOUtil.close( rw );
@@ -288,33 +287,25 @@
File[] files = dir.listFiles();
- for ( int i = 0; i < files.length; i++ )
- {
- File f = files[i];
-
- if ( f.isDirectory() )
- {
- if ( f.getName().equals( ".svn" ) )
- {
+ for (File f : files) {
+ if (f.isDirectory()) {
+ if (f.getName().equals(".svn")) {
continue;
}
- if ( f.getName().endsWith( version ) )
- {
- String s = f.getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
- s = StringUtils.replace( s, "\\", "/" );
+ if (f.getName().endsWith(version)) {
+ String s = f.getAbsolutePath().substring(basedir.getAbsolutePath().length() + 1);
+ s = StringUtils.replace(s, "\\", "/");
- moveCommands.add( "mv " + s + IN_PROCESS_MARKER + " " + s );
+ moveCommands.add("mv " + s + IN_PROCESS_MARKER + " " + s);
}
- scanDirectory( basedir, f, zos, version, moveCommands );
- }
- else
- {
- InputStream is = new FileInputStream( f );
+ scanDirectory(basedir, f, zos, version, moveCommands);
+ } else {
+ InputStream is = new FileInputStream(f);
- String s = f.getAbsolutePath().substring( basedir.getAbsolutePath().length() + 1 );
- s = StringUtils.replace( s, "\\", "/" );
+ String s = f.getAbsolutePath().substring(basedir.getAbsolutePath().length() + 1);
+ s = StringUtils.replace(s, "\\", "/");
// We are marking any version directories with the in-process flag so that
// anything being unpacked on the target side will not be recogized by Maven
@@ -322,23 +313,22 @@
String vtag = "/" + version;
- s = StringUtils.replace( s, vtag + "/", vtag + IN_PROCESS_MARKER + "/" );
+ s = StringUtils.replace(s, vtag + "/", vtag + IN_PROCESS_MARKER + "/");
- ZipEntry e = new ZipEntry( s );
+ ZipEntry e = new ZipEntry(s);
- zos.putNextEntry( e );
+ zos.putNextEntry(e);
- IOUtil.copy( is, zos );
+ IOUtil.copy(is, zos);
- IOUtil.close( is );
+ IOUtil.close(is);
- int idx = s.indexOf( IN_PROCESS_MARKER );
+ int idx = s.indexOf(IN_PROCESS_MARKER);
- if ( idx > 0 )
- {
- String d = s.substring( 0, idx );
+ if (idx > 0) {
+ String d = s.substring(0, idx);
- moveCommands.add( "mv " + d + IN_PROCESS_MARKER + " " + d );
+ moveCommands.add("mv " + d + IN_PROCESS_MARKER + " " + d);
}
}
}
@@ -438,16 +428,12 @@
String retValue = "";
- for ( int i = 0; i < binaryData.length; i++ )
- {
- String t = Integer.toHexString( binaryData[i] & 0xff );
+ for (byte aBinaryData : binaryData) {
+ String t = Integer.toHexString(aBinaryData & 0xff);
- if ( t.length() == 1 )
- {
- retValue += ( "0" + t );
- }
- else
- {
+ if (t.length() == 1) {
+ retValue += ("0" + t);
+ } else {
retValue += t;
}
}
diff --git a/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java b/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
index e92d1f5..6c19b77 100644
--- a/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
+++ b/src/test/java/org/apache/maven/plugins/stage/RepositoryCopierTest.java
@@ -61,9 +61,8 @@
"maven-script-beanshell",
"maven-settings" };
- for ( int i = 0; i < s.length; i++ )
- {
- testMavenArtifact( targetRepo, s[i] );
+ for (String value : s) {
+ testMavenArtifact(targetRepo, value);
}
// leave something behind to clean it up.
