You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2018/05/26 04:42:47 UTC
[maven-scm] branch master updated: fixed issues reported by
Checkstyle
This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-scm.git
The following commit(s) were added to refs/heads/master by this push:
new 256b651 fixed issues reported by Checkstyle
256b651 is described below
commit 256b65177fd4f6fb8a6994a6f20729e89835b830
Author: Hervé Boutemy <hb...@apache.org>
AuthorDate: Sat May 26 06:42:04 2018 +0200
fixed issues reported by Checkstyle
---
.../command/checkout/AbstractCheckOutCommand.java | 2 +-
.../org/apache/maven/scm/provider/ScmProvider.java | 3 ++-
.../apache/maven/scm/util/AbstractConsumer.java | 2 +-
.../org/apache/maven/scm/plugin/BootstrapMojo.java | 23 ++++++++++++++++++++--
.../org/apache/maven/scm/provider/hg/HgUtils.java | 14 +++++++------
.../hg/command/inventory/HgOutgoingConsumer.java | 2 --
.../changelog/JazzListChangesetConsumer.java | 3 ++-
.../gitexe/command/status/GitStatusConsumer.java | 8 +++++---
.../gitexe/command/update/GitUpdateCommand.java | 2 +-
9 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java
index 56fb77c..56d35c8 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java
@@ -79,6 +79,6 @@ public abstract class AbstractCheckOutCommand
ScmVersion scmVersion = parameters.getScmVersion( CommandParameter.SCM_VERSION, null );
boolean recursive = parameters.getBoolean( CommandParameter.RECURSIVE, true );
boolean shallow = parameters.getBoolean( CommandParameter.SHALLOW, false );
- return executeCheckOutCommand( repository, fileSet, scmVersion, recursive, shallow);
+ return executeCheckOutCommand( repository, fileSet, scmVersion, recursive, shallow );
}
}
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
index a698f5a..a2d005f 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
@@ -496,7 +496,8 @@ public interface ScmProvider
* Create a copy of the repository on your local machine.
*
* @param scmRepository the source control system
- * @param scmFileSet the files are copied to the {@link org.apache.maven.scm.ScmFileSet#getBasedir()} location
+ * @param scmFileSet the files are copied to the {@link org.apache.maven.scm.ScmFileSet#getBasedir()}
+ * location
* @param version get the version defined by the revision, branch or tag
* @param commandParameters parameters
* @return
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/util/AbstractConsumer.java b/maven-scm-api/src/main/java/org/apache/maven/scm/util/AbstractConsumer.java
index b22a29b..389d7a4 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/util/AbstractConsumer.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/util/AbstractConsumer.java
@@ -82,7 +82,7 @@ public abstract class AbstractConsumer
if ( StringUtils.isNotEmpty( userPattern ) )
{
- if (locale != null )
+ if ( locale != null )
{
format = new SimpleDateFormat( userPattern, locale );
localeUsed = locale;
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java
index 4f5a4d6..eed57e9 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java
@@ -1,5 +1,24 @@
package org.apache.maven.scm.plugin;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
import java.io.File;
/*
@@ -69,7 +88,7 @@ public class BootstrapMojo
/**
* The path where your maven is installed
*/
- @Parameter( property = "mavenHome", defaultValue="${maven.home}")
+ @Parameter( property = "mavenHome", defaultValue = "${maven.home}" )
private File mavenHome;
/** {@inheritDoc} */
@@ -117,7 +136,7 @@ public class BootstrapMojo
if ( this.mavenHome == null )
{
- cl.setExecutable( "mvn" );//none windows only
+ cl.setExecutable( "mvn" ); // none windows only
}
else
{
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
index 68f21a4..3648e5c 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/HgUtils.java
@@ -315,7 +315,7 @@ public final class HgUtils
* @return true if a different outgoing branch was found
* @throws ScmException on outgoing command error
*/
- public static boolean differentOutgoingBranchFound( ScmLogger logger, File workingDir,String workingbranchName )
+ public static boolean differentOutgoingBranchFound( ScmLogger logger, File workingDir, String workingbranchName )
throws ScmException
{
String[] outCmd = new String[]{ HgCommandConstants.OUTGOING_CMD };
@@ -326,10 +326,11 @@ public final class HgUtils
{
for ( HgChangeSet set : changes )
{
- if (!getBranchName(workingbranchName).equals(getBranchName(set.getBranch()))) {
- logger.warn( "A different branch than " + getBranchName(workingbranchName)
- + " was found in outgoing changes, branch name was " + getBranchName(set.getBranch())
- + ". Only local branch named " + getBranchName(workingbranchName) + " will be pushed." );
+ if ( !getBranchName( workingbranchName ).equals( getBranchName( set.getBranch() ) ) )
+ {
+ logger.warn( "A different branch than " + getBranchName( workingbranchName )
+ + " was found in outgoing changes, branch name was " + getBranchName( set.getBranch() )
+ + ". Only local branch named " + getBranchName( workingbranchName ) + " will be pushed." );
return true;
}
}
@@ -337,7 +338,8 @@ public final class HgUtils
return false;
}
- private static String getBranchName(String branch) {
+ private static String getBranchName( String branch )
+ {
return branch == null ? DEFAULT : branch;
}
diff --git a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
index f5eebfb..be10814 100644
--- a/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-hg/src/main/java/org/apache/maven/scm/provider/hg/command/inventory/HgOutgoingConsumer.java
@@ -22,8 +22,6 @@ package org.apache.maven.scm.provider.hg.command.inventory;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.hg.command.HgConsumer;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
diff --git a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
index 5740388..e78caa2 100644
--- a/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-jazz/src/main/java/org/apache/maven/scm/provider/jazz/command/changelog/JazzListChangesetConsumer.java
@@ -351,7 +351,8 @@ public class JazzListChangesetConsumer
// try again forcing en locale
if ( changesetDate == null )
{
- changesetDate = parseDate( date.toString(), userDateFormat, JAZZ_TIMESTAMP_PATTERN_TIME, Locale.ENGLISH );
+ changesetDate =
+ parseDate( date.toString(), userDateFormat, JAZZ_TIMESTAMP_PATTERN_TIME, Locale.ENGLISH );
}
// Get today's time/date. Used to get the date.
Calendar today = Calendar.getInstance();
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
index 8e06a4a..00a1ef3 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/status/GitStatusConsumer.java
@@ -285,7 +285,9 @@ public class GitStatusConsumer
private static String stripQuotes( String str )
{
int strLen = str.length();
- return ( strLen > 0 && str.startsWith( "\"" ) && str.endsWith( "\"" ) ) ? unescape( str.substring( 1, strLen - 1 ) ) : str;
+ return ( strLen > 0 && str.startsWith( "\"" ) && str.endsWith( "\"" ) )
+ ? unescape( str.substring( 1, strLen - 1 ) )
+ : str;
}
/**
@@ -369,7 +371,7 @@ public class GitStatusConsumer
inSub--;
break;
}
- pos = fileEntry.indexOf( '\\', inSub);
+ pos = fileEntry.indexOf( '\\', inSub );
if ( pos == -1 ) // No more backslashes; we're done
{
System.arraycopy( inba, inSub, outba, outSub, inba.length - inSub );
@@ -380,7 +382,7 @@ public class GitStatusConsumer
try
{
// explicit say UTF-8, otherwise it'll fail at least on Windows cmdline
- return new String(outba, 0, outSub, "UTF-8");
+ return new String( outba, 0, outSub, "UTF-8" );
}
catch ( UnsupportedEncodingException e )
{
diff --git a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
index f5a8ddc..68e66a4 100644
--- a/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
+++ b/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-gitexe/src/main/java/org/apache/maven/scm/provider/git/gitexe/command/update/GitUpdateCommand.java
@@ -159,7 +159,7 @@ public class GitUpdateCommand
// if any branch is given, lets take em
cl.createArg().setValue( scmVersion.getName() );
}
- // otherwise we work on HEAD/current branch
+ // otherwise we work on HEAD/current branch
return cl;
}
--
To stop receiving notification emails like this one, please contact
hboutemy@apache.org.