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 2014/11/10 19:31:23 UTC
[5/5] maven-scm git commit: updated parent pom and fixed errors
reported by Checkstyle
updated parent pom and fixed errors reported by Checkstyle
Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/f7199bbf
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/f7199bbf
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/f7199bbf
Branch: refs/heads/master
Commit: f7199bbf20e57b71d32463ae327a82ecd06bf59d
Parents: c7e6187
Author: Hervé Boutemy <hb...@apache.org>
Authored: Mon Nov 10 19:31:12 2014 +0100
Committer: Hervé Boutemy <hb...@apache.org>
Committed: Mon Nov 10 19:31:12 2014 +0100
----------------------------------------------------------------------
.../java/org/apache/maven/scm/ChangeSet.java | 13 +-
.../org/apache/maven/scm/CommandParameter.java | 4 +-
.../apache/maven/scm/ScmBranchParameters.java | 4 +-
.../org/apache/maven/scm/ScmFileStatus.java | 4 +-
.../java/org/apache/maven/scm/ScmRequest.java | 4 +-
.../org/apache/maven/scm/ScmTagParameters.java | 4 +-
.../scm/command/blame/BlameScmRequest.java | 1 +
.../command/branch/AbstractBranchCommand.java | 5 +-
.../changelog/AbstractChangeLogCommand.java | 1 +
.../maven/scm/command/diff/DiffScmResult.java | 10 +-
.../maven/scm/command/edit/EditScmResult.java | 5 +-
.../scm/command/tag/AbstractTagCommand.java | 3 +-
.../update/UpdateScmResultWithRevision.java | 3 +-
.../apache/maven/scm/provider/ScmProvider.java | 3 +-
.../scm/provider/ScmProviderRepository.java | 2 +-
.../apache/maven/scm/util/FilenameUtils.java | 3 +
.../maven/scm/util/ThreadSafeDateFormat.java | 11 +-
.../scm/manager/plexus/DefaultScmManager.java | 4 +-
.../maven/scm/plugin/AbstractScmMojo.java | 11 +-
.../apache/maven/scm/plugin/BootstrapMojo.java | 2 +-
.../scm/plugin/CheckLocalModificationsMojo.java | 3 +-
.../apache/maven/scm/plugin/CheckoutMojo.java | 9 +-
.../org/apache/maven/scm/plugin/ExportMojo.java | 28 +--
.../org/apache/maven/scm/plugin/TagMojo.java | 6 +-
.../apache/maven/scm/plugin/ValidateMojo.java | 15 +-
.../maven/scm/provider/accurev/AccuRev.java | 14 +-
.../scm/provider/accurev/AccuRevCapability.java | 23 +--
.../scm/provider/accurev/AccuRevException.java | 3 +
.../maven/scm/provider/accurev/AccuRevInfo.java | 3 +
.../provider/accurev/AccuRevScmProvider.java | 16 +-
.../accurev/AccuRevScmProviderRepository.java | 8 +-
.../maven/scm/provider/accurev/AccuRevStat.java | 3 +
.../scm/provider/accurev/AccuRevVersion.java | 11 +-
.../provider/accurev/CategorisedElements.java | 3 +
.../scm/provider/accurev/FileDifference.java | 3 +
.../maven/scm/provider/accurev/Stream.java | 3 +
.../maven/scm/provider/accurev/Transaction.java | 6 +
.../maven/scm/provider/accurev/WorkSpace.java | 3 +
.../accurev/cli/AccuRevCommandLine.java | 33 ++--
.../provider/accurev/cli/AuthTokenConsumer.java | 3 +
.../accurev/cli/ClientVersionConsumer.java | 3 +
.../accurev/cli/CommandOutputConsumer.java | 3 +
.../scm/provider/accurev/cli/DiffConsumer.java | 8 +-
.../scm/provider/accurev/cli/ErrorConsumer.java | 5 +-
.../scm/provider/accurev/cli/FileConsumer.java | 5 +-
.../provider/accurev/cli/HistoryConsumer.java | 3 +
.../scm/provider/accurev/cli/InfoConsumer.java | 3 +
.../accurev/cli/StatBackingConsumer.java | 3 +
.../scm/provider/accurev/cli/StatConsumer.java | 3 +
.../provider/accurev/cli/StreamsConsumer.java | 3 +
.../provider/accurev/cli/WorkSpaceConsumer.java | 3 +
.../accurev/command/AbstractAccuRevCommand.java | 3 +
.../AbstractAccuRevExtractSourceCommand.java | 3 +
.../accurev/command/add/AccuRevAddCommand.java | 3 +
.../command/checkin/AccuRevCheckInCommand.java | 6 +-
.../checkout/AccuRevCheckOutCommand.java | 12 +-
.../command/export/AccuRevExportCommand.java | 20 +--
.../command/login/AccuRevLoginCommand.java | 3 +
.../command/remove/AccuRevRemoveCommand.java | 3 +
.../command/status/AccuRevStatusCommand.java | 3 +
.../accurev/command/tag/AccuRevTagCommand.java | 3 +
.../command/update/AccuRevUpdateCommand.java | 3 +
.../command/update/AccuRevUpdateScmResult.java | 3 +-
.../accurev/util/QuotedPropertyParser.java | 4 +
.../provider/accurev/util/WorkspaceUtils.java | 5 +-
.../maven/scm/provider/bazaar/BazaarUtils.java | 2 +-
.../provider/bazaar/command/BazaarConsumer.java | 17 +-
.../command/checkin/BazaarCheckInCommand.java | 3 +-
.../command/checkout/BazaarCheckOutCommand.java | 3 +-
.../bazaar/command/diff/BazaarDiffConsumer.java | 4 +-
.../bazaar/command/tag/BazaarLsConsumer.java | 31 ++--
.../bazaar/command/tag/BazaarTagCommand.java | 42 +++--
.../command/update/BazaarUpdateCommand.java | 3 +-
.../repository/BazaarScmProviderRepository.java | 9 +-
.../command/blame/ClearCaseBlameCommand.java | 3 +-
.../checkout/ClearCaseCheckOutCommand.java | 3 +-
.../checkout/ClearCaseCheckOutConsumer.java | 2 +-
.../provider/clearcase/util/ClearCaseUtil.java | 10 +-
.../apache/maven/scm/provider/hg/HgUtils.java | 3 +-
.../provider/hg/command/HgCommandConstants.java | 3 +-
.../hg/command/branch/HgBranchCommand.java | 28 ++-
.../command/changelog/HgChangeLogConsumer.java | 4 +-
.../hg/command/checkin/HgCheckInCommand.java | 7 +-
.../hg/command/diff/HgDiffConsumer.java | 4 +-
.../hg/command/info/HgInfoConsumer.java | 9 +-
.../hg/command/inventory/HgChangeSet.java | 34 ++--
.../command/inventory/HgOutgoingConsumer.java | 34 ++--
.../hg/command/status/HgStatusCommand.java | 4 +-
.../provider/hg/command/tag/HgTagCommand.java | 3 +-
.../hg/command/update/HgUpdateCommand.java | 26 +--
.../hg/repository/HgScmProviderRepository.java | 4 +-
.../scm/provider/integrity/APISession.java | 4 +-
.../provider/integrity/ExceptionHandler.java | 175 ++++++++++---------
.../integrity/IntegrityScmProvider.java | 11 +-
.../maven/scm/provider/integrity/Member.java | 24 +--
.../maven/scm/provider/integrity/Project.java | 29 +--
.../maven/scm/provider/integrity/Sandbox.java | 20 +--
.../command/add/IntegrityAddCommand.java | 2 +-
.../command/blame/IntegrityBlameCommand.java | 2 +-
.../command/blame/IntegrityBlameConsumer.java | 2 +-
.../command/branch/IntegrityBranchCommand.java | 2 +-
.../changelog/IntegrityChangeLogCommand.java | 2 +-
.../checkin/IntegrityCheckInCommand.java | 2 +-
.../checkout/IntegrityCheckOutCommand.java | 5 +-
.../command/diff/IntegrityDiffCommand.java | 6 +-
.../command/diff/IntegrityDiffConsumer.java | 2 +-
.../command/edit/IntegrityEditCommand.java | 2 +-
.../command/export/IntegrityExportCommand.java | 2 +-
.../fileinfo/IntegrityFileInfoCommand.java | 2 +-
.../fileinfo/IntegrityFileInfoConsumer.java | 2 +-
.../command/list/IntegrityListCommand.java | 2 +-
.../command/lock/IntegrityLockCommand.java | 2 +-
.../command/login/IntegrityLoginCommand.java | 2 +-
.../command/mkdir/IntegrityMkdirCommand.java | 2 +-
.../command/remove/IntegrityRemoveCommand.java | 2 +-
.../command/status/IntegrityStatusCommand.java | 2 +-
.../command/tag/IntegrityTagCommand.java | 2 +-
.../command/unedit/IntegrityUnEditCommand.java | 2 +-
.../command/unlock/IntegrityUnlockCommand.java | 2 +-
.../command/update/IntegrityUpdateCommand.java | 2 +-
.../IntegrityScmProviderRepository.java | 2 +-
.../integrity/command/IntegrityCommandTest.java | 2 +-
.../command/add/IntegrityAddCommandTest.java | 2 +-
.../branch/IntegrityBranchCommandTest.java | 2 +-
.../IntegrityChangeLogCommandTest.java | 2 +-
.../checkin/IntegrityCheckInCommandTest.java | 2 +-
.../checkout/IntegrityCheckOutCommandTest.java | 2 +-
.../export/IntegrityExportCommandTest.java | 2 +-
.../command/list/IntegrityListCommandTest.java | 2 +-
.../command/lock/IntegrityLockCommandTest.java | 2 +-
.../status/IntegrityStatusCommandTest.java | 2 +-
.../command/tag/IntegrityTagCommandTest.java | 2 +-
.../unedit/IntegrityUnEditCommandTest.java | 2 +-
.../update/IntegrityUpdateCommandTest.java | 2 +-
.../IntegrityScmProviderRepositoryTest.java | 2 +-
.../scm/provider/jazz/JazzScmProvider.java | 3 +-
.../jazz/command/add/JazzAddCommand.java | 7 +-
.../changelog/JazzListChangesetConsumer.java | 11 +-
.../jazz/command/diff/JazzDiffCommand.java | 3 +-
.../jazz/command/status/JazzStatusConsumer.java | 8 +-
.../jazz/command/update/JazzUpdateConsumer.java | 6 +-
.../repository/JazzScmProviderRepository.java | 16 +-
.../command/checkin/LocalCheckInCommand.java | 2 +-
.../command/status/LocalStatusCommand.java | 2 +-
.../local/command/tag/LocalTagCommand.java | 6 +-
.../provider/perforce/PerforceScmProvider.java | 6 +-
.../perforce/command/PerforceVerbMapper.java | 2 +-
.../command/blame/PerforceBlameCommand.java | 38 ++--
.../command/blame/PerforceFilelogConsumer.java | 4 +-
.../changelog/PerforceChangeLogCommand.java | 25 +--
.../changelog/PerforceChangeLogConsumer.java | 15 +-
.../changelog/PerforceChangesConsumer.java | 2 +-
.../changelog/PerforceDescribeConsumer.java | 16 +-
.../command/edit/PerforceEditCommand.java | 1 -
.../command/update/PerforceHaveConsumer.java | 2 +-
.../command/update/PerforceUpdateCommand.java | 2 +-
.../PerforceScmProviderRepository.java | 6 +-
.../provider/starteam/StarteamScmProvider.java | 12 +-
.../command/diff/StarteamDiffConsumer.java | 4 +-
.../provider/starteam/util/StarteamUtil.java | 10 +-
.../changelog/SynergyChangeLogCommand.java | 3 +-
.../synergy/command/tag/SynergyTagCommand.java | 10 +-
.../command/update/SynergyUpdateCommand.java | 3 +-
.../SynergyShowDefaultTaskConsumer.java | 4 +-
.../scm/provider/synergy/util/SynergyCCM.java | 12 +-
.../synergy/util/SynergyTaskManager.java | 15 +-
.../scm/provider/synergy/util/SynergyUtil.java | 37 ++--
.../maven/scm/provider/tfs/TfsScmProvider.java | 18 +-
.../provider/tfs/TfsScmProviderRepository.java | 3 +
.../scm/provider/tfs/command/TfsAddCommand.java | 3 +
.../provider/tfs/command/TfsBranchCommand.java | 3 +
.../tfs/command/TfsChangeLogCommand.java | 2 +
.../provider/tfs/command/TfsCheckInCommand.java | 3 +
.../tfs/command/TfsCheckOutCommand.java | 3 +
.../scm/provider/tfs/command/TfsCommand.java | 10 +-
.../provider/tfs/command/TfsEditCommand.java | 3 +
.../provider/tfs/command/TfsListCommand.java | 3 +
.../provider/tfs/command/TfsStatusCommand.java | 3 +
.../scm/provider/tfs/command/TfsTagCommand.java | 4 +-
.../provider/tfs/command/TfsUnEditCommand.java | 3 +
.../provider/tfs/command/TfsUpdateCommand.java | 3 +
.../tfs/command/blame/TfsBlameCommand.java | 3 +-
.../command/consumer/ChangedFileConsumer.java | 11 +-
.../command/consumer/ErrorStreamConsumer.java | 3 +
.../tfs/command/consumer/FileListConsumer.java | 3 +
.../consumer/ServerFileListConsumer.java | 3 +
.../maven/scm/provider/vss/VssScmProvider.java | 3 +-
.../vss/commands/VssCommandLineUtils.java | 23 +--
.../vss/commands/VssParameterContext.java | 12 +-
.../vss/commands/add/VssAddConsumer.java | 3 +-
.../provider/cvslib/AbstractCvsScmProvider.java | 6 +-
.../cvslib/command/blame/CvsBlameConsumer.java | 2 +-
.../cvslib/command/diff/CvsDiffConsumer.java | 4 +-
.../cvslib/command/list/CvsListConsumer.java | 10 +-
.../command/mkdir/AbstractCvsMkdirCommand.java | 2 +-
.../maven/scm/provider/cvslib/util/CvsUtil.java | 4 +-
.../command/mkdir/CvsMkdirCommandTckTest.java | 3 +
.../provider/git/AbstractGitScmProvider.java | 3 +-
.../git/command/diff/GitDiffConsumer.java | 4 +-
.../provider/git/command/info/GitInfoItem.java | 4 +-
.../repository/GitScmProviderRepository.java | 12 +-
.../provider/git/repository/RepositoryUrl.java | 4 +-
.../maven/scm/provider/git/util/GitUtil.java | 6 +-
.../git/gitexe/command/add/GitAddCommand.java | 6 +-
.../gitexe/command/blame/GitBlameConsumer.java | 18 +-
.../gitexe/command/branch/GitBranchCommand.java | 8 +-
.../branch/GitCurrentBranchConsumer.java | 2 +-
.../command/changelog/GitChangeLogCommand.java | 9 +-
.../command/changelog/GitChangeLogConsumer.java | 4 +-
.../command/checkin/GitCheckInCommand.java | 18 +-
.../git/gitexe/command/diff/GitDiffCommand.java | 3 +-
.../gitexe/command/diff/GitDiffRawConsumer.java | 2 +-
.../git/gitexe/command/info/GitInfoCommand.java | 7 +-
.../gitexe/command/status/GitStatusCommand.java | 12 +-
.../command/status/GitStatusConsumer.java | 30 ++--
.../git/gitexe/command/tag/GitTagCommand.java | 14 +-
.../gitexe/command/update/GitUpdateCommand.java | 11 +-
.../changelog/GitChangeLogCommandTckTest.java | 6 +-
.../AbstractGitRemoteInfoCommandTckTest.java | 13 +-
.../provider/git/jgit/command/JGitUtils.java | 46 +++--
.../jgit/command/blame/JGitBlameCommand.java | 3 +-
.../command/changelog/JGitChangeLogCommand.java | 3 +
.../command/checkin/JGitCheckInCommand.java | 11 +-
.../command/checkout/JGitCheckOutCommand.java | 10 +-
.../maven/scm/provider/svn/SvnCommandUtils.java | 3 +-
.../scm/provider/svn/SvnTagBranchUtils.java | 3 +-
.../svn/command/diff/SvnDiffConsumer.java | 4 +-
.../provider/svn/command/info/SvnInfoItem.java | 4 +-
.../maven/scm/provider/svn/util/SvnUtil.java | 4 +-
.../svn/svnexe/command/SvnCommandLineUtils.java | 10 +-
.../svn/svnexe/command/add/SvnAddConsumer.java | 3 +-
.../svnexe/command/branch/SvnBranchCommand.java | 11 +-
.../changelog/IllegalOutputException.java | 1 -
.../command/changelog/SvnChangeLogCommand.java | 4 +-
.../command/changelog/SvnChangeLogConsumer.java | 4 +-
.../command/checkin/SvnCheckInCommand.java | 3 +-
.../command/export/SvnExeExportCommand.java | 3 +-
.../svnexe/command/mkdir/SvnMkdirConsumer.java | 2 +-
.../remoteinfo/SvnRemoteInfoCommand.java | 1 +
.../svnexe/command/remove/SvnRemoveCommand.java | 3 +-
.../command/remove/SvnRemoveConsumer.java | 3 +-
.../command/status/SvnStatusConsumer.java | 3 +-
.../svn/svnexe/command/tag/SvnTagCommand.java | 2 +-
.../maven/scm/provider/svn/SvnScmTestUtils.java | 6 +-
.../maven/scm/manager/ScmManagerStub.java | 3 +-
.../scm/provider/ScmProviderRepositoryStub.java | 3 +-
.../maven/scm/provider/ScmProviderStub.java | 3 +-
.../maven/scm/repository/ScmRepositoryStub.java | 3 +-
.../changelog/ChangeLogCommandTckTest.java | 4 +-
.../command/checkin/CheckInCommandTckTest.java | 8 +-
pom.xml | 3 +-
251 files changed, 1057 insertions(+), 818 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
index a847383..2d4c4e5 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java
@@ -453,7 +453,7 @@ public class ChangeSet
public Set<String> getMergedRevisions()
{
- return mergedRevisions == null ? Collections.<String> emptySet() : mergedRevisions;
+ return mergedRevisions == null ? Collections.<String>emptySet() : mergedRevisions;
}
public void setMergedRevisions( Set<String> mergedRevisions )
@@ -498,7 +498,7 @@ public class ChangeSet
*/
public String toXML()
{
- StringBuilder buffer = new StringBuilder("\t<changelog-entry>\n" );
+ StringBuilder buffer = new StringBuilder( "\t<changelog-entry>\n" );
if ( getDate() != null )
{
@@ -536,11 +536,15 @@ public class ChangeSet
buffer.append( "\t\t\t<revision>" ).append( file.getRevision() ).append( "</revision>\n" );
if ( file.getOriginalName() != null )
{
- buffer.append( "\t\t\t<orig-name>" ).append( escapeValue( file.getOriginalName() ) ).append( "</orig-name>\n" );
+ buffer.append( "\t\t\t<orig-name>" );
+ buffer.append( escapeValue( file.getOriginalName() ) );
+ buffer.append( "</orig-name>\n" );
}
if ( file.getOriginalRevision() != null )
{
- buffer.append( "\t\t\t<orig-revision>" ).append( file.getOriginalRevision() ).append( "</orig-revision>\n" );
+ buffer.append( "\t\t\t<orig-revision>" );
+ buffer.append( file.getOriginalRevision() );
+ buffer.append( "</orig-revision>\n" );
}
buffer.append( "\t\t</file>\n" );
}
@@ -641,6 +645,7 @@ public class ChangeSet
size += 5;
i += 5;
break;
+ default:
}
}
return buffer.toString();
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java b/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
index 93ee6d2..cb7de83 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java
@@ -1,7 +1,5 @@
package org.apache.maven.scm;
-import java.io.Serializable;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.io.Serializable;
* under the License.
*/
+import java.io.Serializable;
+
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
*
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranchParameters.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranchParameters.java b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranchParameters.java
index 65718de..919f4a9 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranchParameters.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranchParameters.java
@@ -1,7 +1,5 @@
package org.apache.maven.scm;
-import java.io.Serializable;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.io.Serializable;
* under the License.
*/
+import java.io.Serializable;
+
/**
* @author Olivier Lamy
* @since 1.2
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java
index ba09a73..1e861b2 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java
@@ -1,7 +1,5 @@
package org.apache.maven.scm;
-import java.io.Serializable;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.io.Serializable;
* under the License.
*/
+import java.io.Serializable;
+
/**
* @TODO move to a real enum
* <p/>
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRequest.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRequest.java b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRequest.java
index 1290c52..9541a03 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRequest.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRequest.java
@@ -26,8 +26,8 @@ import java.io.Serializable;
/**
* Base class for SCM wrapped parameters.
* Unlike {@link ScmResult}, this is mutable, as its use requires more flexibility when configuring the call.
- * <p>Most parameters should be stored in {@link #getCommandParameters() parameters} field, as it makes them easy to pass
- * down to the implementation side.</p>
+ * <p>Most parameters should be stored in {@link #getCommandParameters() parameters} field, as it makes them easy to
+ * pass down to the implementation side.</p>
* <p>
* Methods in descendant classes should perform all neccessary (un)marshalling so that user can work with nice
* semantic typesafe properties.</p>
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTagParameters.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTagParameters.java b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTagParameters.java
index 51a8b0d..491d940 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTagParameters.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTagParameters.java
@@ -1,7 +1,5 @@
package org.apache.maven.scm;
-import java.io.Serializable;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -21,6 +19,8 @@ import java.io.Serializable;
* under the License.
*/
+import java.io.Serializable;
+
/**
* @author Olivier Lamy
* @since 1.2
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
index 609ea8a..91576c2 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/blame/BlameScmRequest.java
@@ -1,4 +1,5 @@
package org.apache.maven.scm.command.blame;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java
index c7b82cb..446fd65 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java
@@ -65,11 +65,12 @@ public abstract class AbstractBranchCommand
{
String branchName = parameters.getString( CommandParameter.BRANCH_NAME );
- ScmBranchParameters scmBranchParameters = parameters.getScmBranchParameters( CommandParameter.SCM_BRANCH_PARAMETERS );
+ ScmBranchParameters scmBranchParameters =
+ parameters.getScmBranchParameters( CommandParameter.SCM_BRANCH_PARAMETERS );
String message = parameters.getString( CommandParameter.MESSAGE, "[maven-scm] copy for branch " + branchName );
- if (StringUtils.isBlank( scmBranchParameters.getMessage()) && StringUtils.isNotBlank( message ) )
+ if ( StringUtils.isBlank( scmBranchParameters.getMessage() ) && StringUtils.isNotBlank( message ) )
{
scmBranchParameters.setMessage( message );
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
index b599b46..b8473ab 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java
@@ -100,6 +100,7 @@ public abstract class AbstractChangeLogCommand
if ( numDays > 0 )
{
+ @SuppressWarnings( "checkstyle:magicnumber" )
int day = 24 * 60 * 60 * 1000;
startDate = new Date( System.currentTimeMillis() - (long) numDays * day );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
index b0049b7..64107e9 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/DiffScmResult.java
@@ -36,11 +36,12 @@ public class DiffScmResult
private List<ScmFile> changedFiles;
- private Map<String,CharSequence> differences;
+ private Map<String, CharSequence> differences;
private String patch;
- public DiffScmResult( String commandLine, List<ScmFile> changedFiles, Map<String,CharSequence> differences, String patch )
+ public DiffScmResult( String commandLine, List<ScmFile> changedFiles, Map<String, CharSequence> differences,
+ String patch )
{
this( commandLine, null, null, true );
this.changedFiles = changedFiles;
@@ -53,7 +54,8 @@ public class DiffScmResult
super( commandLine, providerMessage, commandOutput, success );
}
- public DiffScmResult( List<ScmFile> changedFiles, Map<String,CharSequence> differences, String patch, ScmResult result )
+ public DiffScmResult( List<ScmFile> changedFiles, Map<String, CharSequence> differences, String patch,
+ ScmResult result )
{
super( result );
@@ -69,7 +71,7 @@ public class DiffScmResult
return changedFiles;
}
- public Map<String,CharSequence> getDifferences()
+ public Map<String, CharSequence> getDifferences()
{
return differences;
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java
index b283144..f9cdd01 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java
@@ -22,12 +22,11 @@ package org.apache.maven.scm.command.edit;
import java.util.List;
import org.apache.maven.scm.ScmFile;
-import org.apache.maven.scm.ScmFileStatus;
import org.apache.maven.scm.ScmResult;
/**
- * @since 1.5 {@link ScmFile} will have the {@link ScmFileStatus} {@link ScmFileStatus#EDITED}
- *
+ * @since 1.5 {@link ScmFile} will have the {@link org.apache.maven.scm.ScmFileStatus}
+ * {@link org.apache.maven.scm.ScmFileStatus#EDITED}
*/
public class EditScmResult
extends ScmResult
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java
index 27c810a..41493d2 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java
@@ -57,7 +57,8 @@ public abstract class AbstractTagCommand
throws ScmException;
/** {@inheritDoc} */
- public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
String tagName = parameters.getString( CommandParameter.TAG_NAME );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java b/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java
index eec78d9..79dd4d8 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/UpdateScmResultWithRevision.java
@@ -53,7 +53,8 @@ public class UpdateScmResultWithRevision
this.revision = revision;
}
- public UpdateScmResultWithRevision( List<ScmFile> updatedFiles, List<ChangeSet> changes, String revision, ScmResult result )
+ public UpdateScmResultWithRevision( List<ScmFile> updatedFiles, List<ChangeSet> changes, String revision,
+ ScmResult result )
{
super( updatedFiles, changes, result );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProvider.java
----------------------------------------------------------------------
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 86aff94..9bdb893 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
@@ -206,7 +206,8 @@ public interface ScmProvider
* @return The SCM result of the changelog command
* @throws ScmException if any
* @deprecated you must use {@link ScmProvider#changeLog(org.apache.maven.scm.repository.ScmRepository,
- * org.apache.maven.scm.ScmFileSet, java.util.Date, java.util.Date, int, org.apache.maven.scm.ScmBranch)}
+ * org.apache.maven.scm.ScmFileSet, java.util.Date, java.util.Date, int,
+ * org.apache.maven.scm.ScmBranch)}
*/
ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, Date startDate, Date endDate,
int numDays, String branch )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java
index bcbe66a..58e2a50 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmProviderRepository.java
@@ -89,7 +89,7 @@ public abstract class ScmProviderRepository
* @since 1.4
* @param pushChanges
*/
- public void setPushChanges(boolean pushChanges)
+ public void setPushChanges( boolean pushChanges )
{
this.pushChanges = pushChanges;
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/util/FilenameUtils.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/util/FilenameUtils.java b/maven-scm-api/src/main/java/org/apache/maven/scm/util/FilenameUtils.java
index 2e63a60..8030fc3 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/util/FilenameUtils.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/util/FilenameUtils.java
@@ -23,6 +23,9 @@ import java.io.File;
import org.codehaus.plexus.util.StringUtils;
+/**
+ *
+ */
public final class FilenameUtils
{
private FilenameUtils()
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
----------------------------------------------------------------------
diff --git a/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java b/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
index 26c6a1a..46bb4c1 100644
--- a/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
+++ b/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
@@ -39,21 +39,22 @@ public class ThreadSafeDateFormat
{
private static final long serialVersionUID = 3786090697869963812L;
- private final String m_sDateFormat;
+ private final String dateFormat;
public ThreadSafeDateFormat( String sDateFormat )
{
- m_sDateFormat = sDateFormat;
+ dateFormat = sDateFormat;
}
- private final ThreadLocal<SoftReference<SimpleDateFormat>> m_formatCache = new ThreadLocal<SoftReference<SimpleDateFormat>>()
+ private final ThreadLocal<SoftReference<SimpleDateFormat>> formatCache =
+ new ThreadLocal<SoftReference<SimpleDateFormat>>()
{
public SoftReference<SimpleDateFormat> get()
{
SoftReference<SimpleDateFormat> softRef = super.get();
if ( softRef == null || softRef.get() == null )
{
- softRef = new SoftReference<SimpleDateFormat>( new SimpleDateFormat( m_sDateFormat ) );
+ softRef = new SoftReference<SimpleDateFormat>( new SimpleDateFormat( dateFormat ) );
super.set( softRef );
}
return softRef;
@@ -62,7 +63,7 @@ public class ThreadSafeDateFormat
private DateFormat getDateFormat()
{
- return m_formatCache.get().get();
+ return formatCache.get().get();
}
public StringBuffer format( Date date, StringBuffer toAppendTo, FieldPosition fieldPosition )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
----------------------------------------------------------------------
diff --git a/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java b/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
index 649ce74..6066519 100644
--- a/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
+++ b/maven-scm-managers/maven-scm-manager-plexus/src/main/java/org/apache/maven/scm/manager/plexus/DefaultScmManager.java
@@ -44,7 +44,7 @@ public class DefaultScmManager
/**
* @plexus.requirement role="org.apache.maven.scm.provider.ScmProvider"
*/
- private Map<String,ScmProvider> scmProviders;
+ private Map<String, ScmProvider> scmProviders;
private Logger logger;
@@ -96,7 +96,7 @@ public class DefaultScmManager
{
if ( scmProviders == null )
{
- scmProviders = new HashMap<String,ScmProvider>( 0 );
+ scmProviders = new HashMap<String, ScmProvider>( 0 );
}
if ( getLogger().isWarnEnabled() && scmProviders.size() == 0 )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
index de2d18c..3e5bfca 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/AbstractScmMojo.java
@@ -157,7 +157,7 @@ public abstract class AbstractScmMojo
* List of provider implementations.
*/
@Parameter
- private Map<String,String> providerImplementations;
+ private Map<String, String> providerImplementations;
/**
* Should distributed changes be pushed to the central repository?
@@ -191,7 +191,7 @@ public abstract class AbstractScmMojo
if ( providerImplementations != null && !providerImplementations.isEmpty() )
{
- for ( Entry<String,String> entry : providerImplementations.entrySet() )
+ for ( Entry<String, String> entry : providerImplementations.entrySet() )
{
String providerType = entry.getKey();
String providerImplementation = entry.getValue();
@@ -501,7 +501,7 @@ public abstract class AbstractScmMojo
}
}
- if ( includes.isEmpty() && excludes.isEmpty() )
+ if ( includes.isEmpty() && excludes.isEmpty() )
{
return;
}
@@ -510,7 +510,7 @@ public abstract class AbstractScmMojo
FileSet fileset = new FileSet();
fileset.setDirectory( checkoutDirectory.getAbsolutePath() );
- fileset.setIncludes( excludes );//revert the order to do the delete
+ fileset.setIncludes( excludes ); // revert the order to do the delete
fileset.setExcludes( includes );
fileset.setUseDefaultExcludes( false );
@@ -520,7 +520,8 @@ public abstract class AbstractScmMojo
}
catch ( IOException e )
{
- throw new MojoExecutionException( "Error found while cleaning up output directory base on excludes/includes configurations.", e );
+ throw new MojoExecutionException( "Error found while cleaning up output directory base on "
+ + "excludes/includes configurations.", e );
}
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/BootstrapMojo.java
----------------------------------------------------------------------
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 720d47b..8607085 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
@@ -82,7 +82,7 @@ public class BootstrapMojo
String relativePathProjectDirectory = "";
if ( checkoutResult instanceof CheckOutScmResult )
{
- relativePathProjectDirectory = ( (CheckOutScmResult) checkoutResult).getRelativePathProjectDirectory();
+ relativePathProjectDirectory = ( (CheckOutScmResult) checkoutResult ).getRelativePathProjectDirectory();
}
runGoals( relativePathProjectDirectory );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java
index be48f8f..df106c6 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckLocalModificationsMojo.java
@@ -83,7 +83,8 @@ public class CheckLocalModificationsMojo
if ( !result.isSuccess() )
{
- throw new MojoExecutionException( "Unable to check for local modifications :" + result.getProviderMessage() );
+ throw new MojoExecutionException( "Unable to check for local modifications : "
+ + result.getProviderMessage() );
}
if ( !result.getChangedFiles().isEmpty() )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java
index df6b4fb..4fd5cd6 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/CheckoutMojo.java
@@ -91,10 +91,10 @@ public class CheckoutMojo
protected File getCheckoutDirectory()
{
- if ( this.checkoutDirectory.getPath().contains( "${project.basedir}" ))
+ if ( this.checkoutDirectory.getPath().contains( "${project.basedir}" ) )
{
//project.basedir is not set under maven 3.x when run without a project
- this.checkoutDirectory = new File( this.getBasedir(), "target/checkout");
+ this.checkoutDirectory = new File( this.getBasedir(), "target/checkout" );
}
return this.checkoutDirectory;
}
@@ -118,16 +118,15 @@ public class CheckoutMojo
ScmFileSet fileSet = new ScmFileSet( getCheckoutDirectory().getAbsoluteFile() );
if ( useExport )
{
- result = getScmManager().export( repository,fileSet, getScmVersion( scmVersionType, scmVersion ) );
+ result = getScmManager().export( repository, fileSet, getScmVersion( scmVersionType, scmVersion ) );
}
else
{
- result = getScmManager().checkOut( repository,fileSet , getScmVersion( scmVersionType, scmVersion ) );
+ result = getScmManager().checkOut( repository, fileSet, getScmVersion( scmVersionType, scmVersion ) );
}
checkResult( result );
-
handleExcludesIncludesAfterCheckoutAndExport( this.checkoutDirectory );
return result;
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java
index 96b1ff8..4855345 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ExportMojo.java
@@ -1,18 +1,22 @@
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
+ * 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.
+ * 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;
@@ -67,7 +71,7 @@ public class ExportMojo
{
super.execute();
- if ( this.skipExportIfExists && this.exportDirectory.isDirectory() )
+ if ( this.skipExportIfExists && this.exportDirectory.isDirectory() )
{
return;
}
@@ -88,10 +92,10 @@ public class ExportMojo
protected void export()
throws MojoExecutionException
{
- if ( this.exportDirectory.getPath().contains( "${project.basedir}" ))
+ if ( this.exportDirectory.getPath().contains( "${project.basedir}" ) )
{
//project.basedir is not set under maven 3.x when run without a project
- this.exportDirectory = new File( this.getBasedir(), "target/export");
+ this.exportDirectory = new File( this.getBasedir(), "target/export" );
}
try
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
index 349d3e0..cc8c01d 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/TagMojo.java
@@ -131,10 +131,10 @@ public class TagMojo
finalTag = provider.sanitizeTagName( finalTag );
getLog().info( "Final Tag Name: '" + finalTag + "'" );
- ScmTagParameters scmTagParameters = new ScmTagParameters( message);
+ ScmTagParameters scmTagParameters = new ScmTagParameters( message );
scmTagParameters.setRemoteTagging( remoteTagging );
-
- TagScmResult result = provider.tag( repository, getFileSet(), finalTag, scmTagParameters);
+
+ TagScmResult result = provider.tag( repository, getFileSet(), finalTag, scmTagParameters );
checkResult( result );
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
----------------------------------------------------------------------
diff --git a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
index 07056dd..0533d59 100644
--- a/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
+++ b/maven-scm-plugin/src/main/java/org/apache/maven/scm/plugin/ValidateMojo.java
@@ -51,13 +51,14 @@ public class ValidateMojo
@Parameter( property = "scmDeveloperConnection", defaultValue = "${project.scm.developerConnection}" )
private String scmDeveloperConnection;
- /**
- * <em>(Subversion specific)</em> Enables checking that "URL" field returned by svn info matches what is specified under the scm tag.
- */
- @Parameter(property = "scmCheckWorkingDirectoryUrl", defaultValue = "false")
- // Actually unused in the code here. Present for doc purpose,
- // see org.apache.maven.scm.provider.svn.AbstractSvnScmProvider.CHECK_WORKING_DIRECTORY_URL
- private boolean scmCheckWorkingDirectoryUrl;
+ /**
+ * <em>(Subversion specific)</em> Enables checking that "URL" field returned by svn info matches what is specified
+ * under the scm tag.
+ */
+ @Parameter( property = "scmCheckWorkingDirectoryUrl", defaultValue = "false" )
+ // Actually unused in the code here. Present for doc purpose,
+ // see org.apache.maven.scm.provider.svn.AbstractSvnScmProvider.CHECK_WORKING_DIRECTORY_URL
+ private boolean scmCheckWorkingDirectoryUrl;
/** {@inheritDoc} */
public void execute()
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java
index 977856e..54ef6ec 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRev.java
@@ -36,19 +36,19 @@ import org.apache.maven.scm.util.ThreadSafeDateFormat;
public interface AccuRev
{
- public static final String DEFAULT_ACCUREV_EXECUTABLE = "accurev";
+ String DEFAULT_ACCUREV_EXECUTABLE = "accurev";
- public static final int DEFAULT_PORT = 5050;
+ int DEFAULT_PORT = 5050;
- public static final String ACCUREV_TIME_FORMAT_STRING = "yyyy/MM/dd HH:mm:ss";
+ String ACCUREV_TIME_FORMAT_STRING = "yyyy/MM/dd HH:mm:ss";
- public static final DateFormat ACCUREV_TIME_SPEC = new ThreadSafeDateFormat( ACCUREV_TIME_FORMAT_STRING );
+ DateFormat ACCUREV_TIME_SPEC = new ThreadSafeDateFormat( ACCUREV_TIME_FORMAT_STRING );
- public static final String DEFAULT_REMOVE_MESSAGE = "removed (maven-scm)";
+ String DEFAULT_REMOVE_MESSAGE = "removed (maven-scm)";
- public static final String DEFAULT_ADD_MESSAGE = "initial version (maven-scm)";
+ String DEFAULT_ADD_MESSAGE = "initial version (maven-scm)";
- public static final String DEFAULT_PROMOTE_MESSAGE = "promote (maven-scm)";
+ String DEFAULT_PROMOTE_MESSAGE = "promote (maven-scm)";
/**
* Reset command process, clear command output accumulators
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java
index 9af436f..1f0a3a1 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevCapability.java
@@ -19,16 +19,19 @@ package org.apache.maven.scm.provider.accurev;
* under the License.
*/
+/**
+ *
+ */
public enum AccuRevCapability
{
DIFF_BETWEEN_STREAMS( "4.7.2", null ), POPULATE_TO_TRANSACTION( "4.9.0", "4.9.9" ), STAT_ADDED_NOT_PROMOTED_BUG(
"4.9.0", "4.9.9" );
- public static final String DEFAULT_VERSION_FOR_TESTS = "4.9.0";
-
- private String fromVersion;
+ public static final String DEFAULT_VERSION_FOR_TESTS = "4.9.0";
+
+ private String fromVersion;
- private String toVersion;
+ private String toVersion;
private AccuRevCapability( String fromVersion, String toVersion )
{
@@ -36,12 +39,12 @@ public enum AccuRevCapability
this.toVersion = toVersion;
}
- /**
- * @todo simple string compare because the version numbers have never used
- * more than one digit.
- * @param version
- * @return if the capability is available for this version
- */
+ /**
+ * @todo simple string compare because the version numbers have never used
+ * more than one digit.
+ * @param version
+ * @return if the capability is available for this version
+ */
public boolean isSupported( String version )
{
return ( fromVersion == null || fromVersion.compareTo( version ) <= 0 )
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevException.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevException.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevException.java
index 148f08b..eaa69c0 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevException.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevException.java
@@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.accurev;
* under the License.
*/
+/**
+ *
+ */
public class AccuRevException
extends Exception
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java
index f3d8e0d..9cb2534 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevInfo.java
@@ -23,6 +23,9 @@ import java.io.File;
import org.apache.maven.scm.provider.accurev.util.WorkspaceUtils;
+/**
+ *
+ */
public class AccuRevInfo
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
index 0965b84..769fbe1 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProvider.java
@@ -310,7 +310,8 @@ public class AccuRevScmProvider
}
@Override
- protected StatusScmResult status( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+ protected StatusScmResult status( ScmProviderRepository repository, ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
@@ -320,7 +321,8 @@ public class AccuRevScmProvider
}
@Override
- protected UpdateScmResult update( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+ protected UpdateScmResult update( ScmProviderRepository repository, ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
@@ -361,9 +363,9 @@ public class AccuRevScmProvider
String author = "";
List<ScmFile> files = result.getUpdatedFiles();
List<ChangeFile> changeFiles = new ArrayList<ChangeFile>( files.size() );
- for (ScmFile scmFile : files)
+ for ( ScmFile scmFile : files )
{
- changeFiles.add(new ChangeFile( scmFile.getPath() ));
+ changeFiles.add( new ChangeFile( scmFile.getPath() ) );
}
ChangeSet dummyChangeSet = new ChangeSet( new Date(), comment, author, changeFiles );
// different streams invalidates the change log, insert a dummy change instead.
@@ -376,7 +378,8 @@ public class AccuRevScmProvider
}
@Override
- protected ExportScmResult export( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+ protected ExportScmResult export( ScmProviderRepository repository, ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
@@ -395,7 +398,8 @@ public class AccuRevScmProvider
}
@Override
- protected RemoveScmResult remove( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters )
+ protected RemoveScmResult remove( ScmProviderRepository repository, ScmFileSet fileSet,
+ CommandParameters parameters )
throws ScmException
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
index f426ac7..9c6e467 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevScmProviderRepository.java
@@ -32,6 +32,9 @@ import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
import org.apache.maven.scm.provider.accurev.util.WorkspaceUtils;
import org.codehaus.plexus.util.StringUtils;
+/**
+ *
+ */
public class AccuRevScmProviderRepository
extends ScmProviderRepositoryWithHost
{
@@ -108,7 +111,9 @@ public class AccuRevScmProviderRepository
*/
public boolean isWorkSpaceRoot( AccuRevInfo info )
{
- return ( ( getProjectPath() != null && WorkspaceUtils.isSameFile(info.getBasedir(), new File( info.getTop(), getProjectPath() ) ) ) || isWorkSpaceTop( info ) );
+ String p = getProjectPath();
+ return ( p != null && WorkspaceUtils.isSameFile( info.getBasedir(), new File( info.getTop(), p ) ) )
+ || isWorkSpaceTop( info );
}
public boolean isWorkSpaceTop( AccuRevInfo info )
@@ -117,7 +122,6 @@ public class AccuRevScmProviderRepository
}
-
String tagToStream( String tagName )
{
return String.format( getTagFormat(), tagName );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevStat.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevStat.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevStat.java
index 0959f3a..14967b5 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevStat.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevStat.java
@@ -21,6 +21,9 @@ package org.apache.maven.scm.provider.accurev;
import java.util.regex.Pattern;
+/**
+ *
+ */
public enum AccuRevStat
{
DEFUNCT( "-D", "defunct" ),
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java
index 87b8ce8..6833ebe 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/AccuRevVersion.java
@@ -1,9 +1,5 @@
package org.apache.maven.scm.provider.accurev;
-import java.util.Date;
-
-import org.codehaus.plexus.util.StringUtils;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,6 +19,13 @@ import org.codehaus.plexus.util.StringUtils;
* under the License.
*/
+import java.util.Date;
+
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ *
+ */
public class AccuRevVersion
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java
index afa4fca..f17ee20 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/CategorisedElements.java
@@ -23,6 +23,9 @@ import java.io.File;
import java.util.ArrayList;
import java.util.List;
+/**
+ *
+ */
public class CategorisedElements
{
private List<File> memberElements = new ArrayList<File>();
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java
index dd5cb87..a8c9ffb 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/FileDifference.java
@@ -21,6 +21,9 @@ package org.apache.maven.scm.provider.accurev;
import java.io.File;
+/**
+ *
+ */
public class FileDifference
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java
index 90f0786..3dc4c5b 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Stream.java
@@ -21,6 +21,9 @@ package org.apache.maven.scm.provider.accurev;
import java.util.Date;
+/**
+ *
+ */
public class Stream
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java
index 40830a6..1e3f696 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/Transaction.java
@@ -23,9 +23,15 @@ import java.util.Collection;
import java.util.Date;
import java.util.HashSet;
+/**
+ *
+ */
public class Transaction
{
+ /**
+ *
+ */
public class Version
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/WorkSpace.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/WorkSpace.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/WorkSpace.java
index 8a29887..77b0fba 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/WorkSpace.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/WorkSpace.java
@@ -19,6 +19,9 @@ package org.apache.maven.scm.provider.accurev;
* under the License.
*/
+/**
+ *
+ */
public class WorkSpace
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java
index 3ec6ae2..70ba195 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AccuRevCommandLine.java
@@ -49,6 +49,9 @@ import org.codehaus.plexus.util.cli.CommandLineUtils;
import org.codehaus.plexus.util.cli.Commandline;
import org.codehaus.plexus.util.cli.StreamConsumer;
+/**
+ *
+ */
public class AccuRevCommandLine
implements AccuRev
{
@@ -296,8 +299,8 @@ public class AccuRevCommandLine
setWorkingDirectory( baseDir );
List<File> updatedFiles = new ArrayList<File>();
- return executeCommandLine( update, null, new FileConsumer( updatedFiles, FileConsumer.UPDATE_PATTERN ) ) == 0 ? updatedFiles
- : null;
+ int ret = executeCommandLine( update, null, new FileConsumer( updatedFiles, FileConsumer.UPDATE_PATTERN ) );
+ return ret == 0 ? updatedFiles : null;
}
@@ -419,14 +422,12 @@ public class AccuRevCommandLine
public List<File> promoteAll( File baseDir, String commitMessage )
throws AccuRevException
{
-
setWorkingDirectory( baseDir );
String[] promote = { "promote", "-p", "-K", "-c", commitMessage };
List<File> promotedFiles = new ArrayList<File>();
- return executeCommandLine( promote, null, new FileConsumer( promotedFiles, FileConsumer.PROMOTE_PATTERN ) ) == 0 ? promotedFiles
- : null;
-
+ int ret = executeCommandLine( promote, null, new FileConsumer( promotedFiles, FileConsumer.PROMOTE_PATTERN ) );
+ return ret == 0 ? promotedFiles : null;
}
public AccuRevInfo info( File basedir )
@@ -500,7 +501,6 @@ public class AccuRevCommandLine
public boolean mksnap( String snapShotName, String basisStream )
throws AccuRevException
{
-
return executeCommandLine( new String[] { "mksnap", "-s", snapShotName, "-b", basisStream, "-t", "now" } );
}
@@ -532,8 +532,8 @@ public class AccuRevCommandLine
String[] args = { "stat", "-ffr", statType.getStatArg(), recursive ? "-R" : null };
List<File> matchingElements = new ArrayList<File>();
- return executeCommandLine( basedir, args, elements, statType.getMatchPattern(), matchingElements ) ? matchingElements
- : null;
+ boolean ret = executeCommandLine( basedir, args, elements, statType.getMatchPattern(), matchingElements );
+ return ret ? matchingElements : null;
}
public List<File> pop( File basedir, Collection<File> elements )
@@ -548,8 +548,8 @@ public class AccuRevCommandLine
String[] popws = { "pop", "-R" };
List<File> poppedFiles = new ArrayList<File>();
- return executeCommandLine( basedir, popws, elements, FileConsumer.POPULATE_PATTERN, poppedFiles ) ? poppedFiles
- : null;
+ boolean ret = executeCommandLine( basedir, popws, elements, FileConsumer.POPULATE_PATTERN, poppedFiles );
+ return ret ? poppedFiles : null;
}
public List<File> popExternal( File basedir, String versionSpec, String tranSpec, Collection<File> elements )
@@ -578,8 +578,8 @@ public class AccuRevCommandLine
}
List<File> poppedFiles = new ArrayList<File>();
- return executeCommandLine( basedir, popArgs, elements, FileConsumer.POPULATE_PATTERN, poppedFiles ) ? poppedFiles
- : null;
+ boolean ret = executeCommandLine( basedir, popArgs, elements, FileConsumer.POPULATE_PATTERN, poppedFiles );
+ return ret ? poppedFiles : null;
}
public CategorisedElements statBackingStream( File basedir, Collection<File> elements )
@@ -594,9 +594,10 @@ public class AccuRevCommandLine
}
String[] args = { "stat", "-b", "-ffr" };
- return executeCommandLine( basedir, args, elements, new StatBackingConsumer( catElems.getMemberElements(),
- catElems.getNonMemberElements() ) ) ? catElems
- : null;
+ boolean ret =
+ executeCommandLine( basedir, args, elements, new StatBackingConsumer( catElems.getMemberElements(),
+ catElems.getNonMemberElements() ) );
+ return ret ? catElems : null;
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumer.java
index e9ee0f3..94f42e8 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/AuthTokenConsumer.java
@@ -25,6 +25,9 @@ import java.util.regex.Pattern;
import org.codehaus.plexus.util.StringUtils;
import org.codehaus.plexus.util.cli.StreamConsumer;
+/**
+ *
+ */
public class AuthTokenConsumer
implements StreamConsumer
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ClientVersionConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ClientVersionConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ClientVersionConsumer.java
index 3e5816c..29335f3 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ClientVersionConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ClientVersionConsumer.java
@@ -24,6 +24,9 @@ import java.util.regex.Pattern;
import org.codehaus.plexus.util.cli.StreamConsumer;
+/**
+ *
+ */
public class ClientVersionConsumer
implements StreamConsumer
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/CommandOutputConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/CommandOutputConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/CommandOutputConsumer.java
index 527a82a..7da2783 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/CommandOutputConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/CommandOutputConsumer.java
@@ -22,6 +22,9 @@ package org.apache.maven.scm.provider.accurev.cli;
import org.apache.maven.scm.log.ScmLogger;
import org.codehaus.plexus.util.cli.StreamConsumer;
+/**
+ *
+ */
public class CommandOutputConsumer
implements StreamConsumer
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java
index 6c508f3..068b375 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/DiffConsumer.java
@@ -25,6 +25,9 @@ import java.util.Map;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.accurev.FileDifference;
+/**
+ *
+ */
public class DiffConsumer
extends XppStreamConsumer
{
@@ -47,7 +50,7 @@ public class DiffConsumer
{
currentDifference = new FileDifference();
}
- else if ( "Stream2".equals( tagName ) && attributes.get( "Name" ) != null)
+ else if ( "Stream2".equals( tagName ) && attributes.get( "Name" ) != null )
{
currentDifference.setElementId( Long.parseLong( attributes.get( "eid" ) ) );
currentDifference.setNewVersion( attributes.get( "Name" ), attributes.get( "Version" ) );
@@ -66,7 +69,8 @@ public class DiffConsumer
String tagName = getTagName( tagPath );
if ( "Element".equals( tagName ) )
{
- if (currentDifference.getNewFile() != null || currentDifference.getOldFile() != null) {
+ if ( currentDifference.getNewFile() != null || currentDifference.getOldFile() != null )
+ {
results.add( currentDifference );
}
}
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ErrorConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ErrorConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ErrorConsumer.java
index e7169b6..a37208b 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ErrorConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/ErrorConsumer.java
@@ -24,12 +24,15 @@ import java.util.regex.Pattern;
import org.apache.maven.scm.log.ScmLogger;
import org.codehaus.plexus.util.cli.StreamConsumer;
+/**
+ *
+ */
final class ErrorConsumer
implements StreamConsumer
{
private static final Pattern[] SKIPPED_WARNINGS = {
- Pattern.compile( ".*replica sync on the master server.*"),
+ Pattern.compile( ".*replica sync on the master server.*" ),
Pattern.compile( "No elements selected.*" ),
Pattern.compile( "You are not in a directory.*" ),
Pattern.compile( "Note.*" ),
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/FileConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/FileConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/FileConsumer.java
index 7d81c56..9c02d02 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/FileConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/FileConsumer.java
@@ -26,6 +26,9 @@ import java.util.regex.Pattern;
import org.codehaus.plexus.util.cli.StreamConsumer;
+/**
+ *
+ */
class FileConsumer
implements StreamConsumer
{
@@ -37,7 +40,7 @@ class FileConsumer
this.filePattern = filematcher;
}
- public List<File> matchedFiles;
+ private List<File> matchedFiles;
// TODO make these an enum
public static final Pattern ADD_PATTERN = Pattern.compile( "Added and kept element [/\\\\]\\.[/\\\\](\\S+)\\s*" );
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumer.java
index 7a86764..6127a85 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/HistoryConsumer.java
@@ -26,6 +26,9 @@ import java.util.Map;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.accurev.Transaction;
+/**
+ *
+ */
public class HistoryConsumer
extends XppStreamConsumer
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumer.java
index 66e8220..4d6e57d 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/InfoConsumer.java
@@ -22,6 +22,9 @@ package org.apache.maven.scm.provider.accurev.cli;
import org.apache.maven.scm.provider.accurev.AccuRevInfo;
import org.codehaus.plexus.util.cli.StreamConsumer;
+/**
+ *
+ */
public class InfoConsumer
implements StreamConsumer
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumer.java
index b8bb006..5c1d30a 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatBackingConsumer.java
@@ -26,6 +26,9 @@ import java.util.regex.Pattern;
import org.codehaus.plexus.util.cli.StreamConsumer;
+/**
+ *
+ */
public class StatBackingConsumer
implements StreamConsumer
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatConsumer.java
index 280af32..2ee29d8 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StatConsumer.java
@@ -24,6 +24,9 @@ import java.util.Map;
import org.apache.maven.scm.log.ScmLogger;
+/**
+ *
+ */
public class StatConsumer
extends XppStreamConsumer
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StreamsConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StreamsConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StreamsConsumer.java
index 2dedc7f..2e22c6e 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StreamsConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/StreamsConsumer.java
@@ -26,6 +26,9 @@ import java.util.Map;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.accurev.Stream;
+/**
+ *
+ */
public class StreamsConsumer
extends XppStreamConsumer
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumer.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumer.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumer.java
index 286e63c..ebdd72c 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumer.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/cli/WorkSpaceConsumer.java
@@ -25,6 +25,9 @@ import java.util.Map;
import org.apache.maven.scm.log.ScmLogger;
import org.apache.maven.scm.provider.accurev.WorkSpace;
+/**
+ *
+ */
public class WorkSpaceConsumer
extends XppStreamConsumer
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommand.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommand.java
index f1f14b0..ee3824d 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommand.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevCommand.java
@@ -35,6 +35,9 @@ import org.apache.maven.scm.provider.ScmProviderRepository;
import org.apache.maven.scm.provider.accurev.AccuRevException;
import org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepository;
+/**
+ *
+ */
public abstract class AbstractAccuRevCommand
extends AbstractCommand
{
http://git-wip-us.apache.org/repos/asf/maven-scm/blob/f7199bbf/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevExtractSourceCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevExtractSourceCommand.java b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevExtractSourceCommand.java
index ac19664..523abd2 100644
--- a/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevExtractSourceCommand.java
+++ b/maven-scm-providers/maven-scm-provider-accurev/src/main/java/org/apache/maven/scm/provider/accurev/command/AbstractAccuRevExtractSourceCommand.java
@@ -35,6 +35,9 @@ import org.apache.maven.scm.provider.accurev.AccuRevException;
import org.apache.maven.scm.provider.accurev.AccuRevScmProviderRepository;
import org.apache.maven.scm.provider.accurev.AccuRevVersion;
+/**
+ *
+ */
public abstract class AbstractAccuRevExtractSourceCommand
extends AbstractAccuRevCommand
{