Return-Path: Delivered-To: apmail-maven-scm-commits-archive@www.apache.org Received: (qmail 4581 invoked from network); 13 Aug 2008 13:28:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Aug 2008 13:28:27 -0000 Received: (qmail 50287 invoked by uid 500); 13 Aug 2008 13:28:26 -0000 Delivered-To: apmail-maven-scm-commits-archive@maven.apache.org Received: (qmail 50251 invoked by uid 500); 13 Aug 2008 13:28:26 -0000 Mailing-List: contact scm-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: scm-dev@maven.apache.org Delivered-To: mailing list scm-commits@maven.apache.org Received: (qmail 50215 invoked by uid 99); 13 Aug 2008 13:28:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Aug 2008 06:28:26 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Aug 2008 13:27:36 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 33942238899E; Wed, 13 Aug 2008 06:27:35 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r685539 [1/2] - in /maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm: ./ command/ command/add/ command/branch/ command/changelog/ command/checkin/ command/checkout/ command/diff/ command/edit/ command/export/ command/list/ c... Date: Wed, 13 Aug 2008 13:27:30 -0000 To: scm-commits@maven.apache.org From: vsiveton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080813132735.33942238899E@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vsiveton Date: Wed Aug 13 06:27:27 2008 New Revision: 685539 URL: http://svn.apache.org/viewvc?rev=685539&view=rev Log: o first pass to try to fix Checkstyle Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/AbstractScmVersion.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/NoSuchCommandScmException.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranch.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmException.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRevision.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTag.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmVersion.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/AbstractCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/Command.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AbstractAddCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/AbstractEditCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/AbstractExportCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/AbstractListCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/AbstractLoginCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/AbstractRemoveCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/AbstractStatusCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/AbstractUnEditCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unlock/AbstractUnlockCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/NoSuchScmProviderException.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/AbstractScmProvider.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/provider/ScmUrlUtils.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepository.java maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/repository/ScmRepositoryException.java Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/AbstractScmVersion.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/AbstractScmVersion.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/AbstractScmVersion.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/AbstractScmVersion.java Wed Aug 13 06:27:27 2008 @@ -28,16 +28,21 @@ { private String name; + /** + * @param name could be null + */ public AbstractScmVersion( String name ) { setName( name ); } + /** {@inheritDoc} */ public String getName() { return name; } + /** {@inheritDoc} */ public void setName( String name ) { if ( name != null ) @@ -47,9 +52,7 @@ this.name = name; } - /** - * @return the version name - */ + /** {@inheritDoc} */ public String toString() { return getName(); Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeSet.java Wed Aug 13 06:27:27 2008 @@ -374,9 +374,7 @@ return TIME_FORMAT.format( getDate() ); } - /** - * @return Returns string representation of the changeset - */ + /** {@inheritDoc} */ public String toString() { String result = author + "\n" + date + "\n"; @@ -442,9 +440,7 @@ return buffer.toString(); } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ + /** {@inheritDoc} */ public boolean equals( Object obj ) { if ( obj instanceof ChangeSet ) @@ -460,6 +456,18 @@ return false; } + /** {@inheritDoc} */ + public int hashCode() + { + final int prime = 31; + int result = 1; + result = prime * result + ( ( author == null ) ? 0 : author.hashCode() ); + result = prime * result + ( ( comment == null ) ? 0 : comment.hashCode() ); + result = prime * result + ( ( date == null ) ? 0 : date.hashCode() ); + result = prime * result + ( ( files == null ) ? 0 : files.hashCode() ); + return result; + } + /** * remove a ]]> from comments (replace it with ] ] >). * Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameter.java Wed Aug 13 06:27:27 2008 @@ -25,41 +25,41 @@ */ public class CommandParameter { - public final static CommandParameter BINARY = new CommandParameter( "binary" ); + public static final CommandParameter BINARY = new CommandParameter( "binary" ); - public final static CommandParameter RECURSIVE = new CommandParameter( "recursive" ); + public static final CommandParameter RECURSIVE = new CommandParameter( "recursive" ); - public final static CommandParameter MESSAGE = new CommandParameter( "message" ); + public static final CommandParameter MESSAGE = new CommandParameter( "message" ); - public final static CommandParameter BRANCH_NAME = new CommandParameter( "branchName" ); + public static final CommandParameter BRANCH_NAME = new CommandParameter( "branchName" ); - public final static CommandParameter START_DATE = new CommandParameter( "startDate" ); + public static final CommandParameter START_DATE = new CommandParameter( "startDate" ); - public final static CommandParameter END_DATE = new CommandParameter( "endDate" ); + public static final CommandParameter END_DATE = new CommandParameter( "endDate" ); - public final static CommandParameter NUM_DAYS = new CommandParameter( "numDays" ); + public static final CommandParameter NUM_DAYS = new CommandParameter( "numDays" ); - public final static CommandParameter BRANCH = new CommandParameter( "branch" ); + public static final CommandParameter BRANCH = new CommandParameter( "branch" ); - public final static CommandParameter START_SCM_VERSION = new CommandParameter( "startScmVersion" ); + public static final CommandParameter START_SCM_VERSION = new CommandParameter( "startScmVersion" ); - public final static CommandParameter END_SCM_VERSION = new CommandParameter( "endScmVersion" ); + public static final CommandParameter END_SCM_VERSION = new CommandParameter( "endScmVersion" ); - public final static CommandParameter CHANGELOG_DATE_PATTERN = new CommandParameter( "changelogDatePattern" ); + public static final CommandParameter CHANGELOG_DATE_PATTERN = new CommandParameter( "changelogDatePattern" ); - public final static CommandParameter SCM_VERSION = new CommandParameter( "scmVersion" ); + public static final CommandParameter SCM_VERSION = new CommandParameter( "scmVersion" ); - public final static CommandParameter TAG_NAME = new CommandParameter( "tagName" ); + public static final CommandParameter TAG_NAME = new CommandParameter( "tagName" ); - public final static CommandParameter FILE = new CommandParameter( "file" ); + public static final CommandParameter FILE = new CommandParameter( "file" ); - public final static CommandParameter FILES = new CommandParameter( "files" ); + public static final CommandParameter FILES = new CommandParameter( "files" ); - public final static CommandParameter OUTPUT_FILE = new CommandParameter( "outputFile" ); + public static final CommandParameter OUTPUT_FILE = new CommandParameter( "outputFile" ); - public final static CommandParameter OUTPUT_DIRECTORY = new CommandParameter( "outputDirectory" ); + public static final CommandParameter OUTPUT_DIRECTORY = new CommandParameter( "outputDirectory" ); - public final static CommandParameter RUN_CHANGELOG_WITH_UPDATE = + public static final CommandParameter RUN_CHANGELOG_WITH_UPDATE = new CommandParameter( "run_changelog_with_update" ); /** Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/CommandParameters.java Wed Aug 13 06:27:27 2008 @@ -112,6 +112,7 @@ * * @param parameter The parameter * @return The parameter value as a int + * @param defaultValue The defaultValue * @throws ScmException if the value is in the wrong type */ public int getInt( CommandParameter parameter, int defaultValue ) @@ -161,6 +162,7 @@ * Return the parameter value as String or the default value if it doesn't exist. * * @param parameter The parameter + * @param defaultValue The defaultValue * @return The parameter value as a Date * @throws ScmException if the value is in the wrong type */ @@ -248,12 +250,24 @@ // File[] // ---------------------------------------------------------------------- + /** + * @param parameter not null + * @return an array of files + * @throws ScmException if any + */ public File[] getFileArray( CommandParameter parameter ) throws ScmException { return (File[]) getObject( File[].class, parameter ); } + /** + * + * @param parameter not null + * @param defaultValue could be null + * @return an array of files + * @throws ScmException if any + */ public File[] getFileArray( CommandParameter parameter, File[] defaultValue ) throws ScmException { @@ -290,6 +304,7 @@ * * @param clazz The type of the parameter value * @param parameter The parameter + * @param defaultValue The defaultValue * @return The parameter value * @throws ScmException if the defaultValue is in the wrong type */ @@ -305,8 +320,8 @@ if ( clazz != null && !clazz.isAssignableFrom( object.getClass() ) ) { - throw new ScmException( "Wrong parameter type for '" + parameter.getName() + ". " + "Expected: " + - clazz.getName() + ", got: " + object.getClass().getName() ); + throw new ScmException( "Wrong parameter type for '" + parameter.getName() + ". " + "Expected: " + + clazz.getName() + ", got: " + object.getClass().getName() ); } return object; Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/NoSuchCommandScmException.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/NoSuchCommandScmException.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/NoSuchCommandScmException.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/NoSuchCommandScmException.java Wed Aug 13 06:27:27 2008 @@ -26,6 +26,9 @@ public class NoSuchCommandScmException extends ScmException { + + static final long serialVersionUID = 5789657554664703221L; + private String commandName; public NoSuchCommandScmException( String commandName ) Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranch.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranch.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranch.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmBranch.java Wed Aug 13 06:27:27 2008 @@ -26,11 +26,15 @@ public class ScmBranch extends AbstractScmVersion { + /** {@inheritDoc} */ public String getType() { return "Branch"; } + /** + * @param name the branch name + */ public ScmBranch( String name ) { super( name ); Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmException.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmException.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmException.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmException.java Wed Aug 13 06:27:27 2008 @@ -26,8 +26,10 @@ public class ScmException extends Exception { + static final long serialVersionUID = 5041965569154385323L; + /** - * @param message + * @param message the message could be null */ public ScmException( String message ) { @@ -35,8 +37,8 @@ } /** - * @param message - * @param cause + * @param message the message could be null + * @param cause the cause could be null */ public ScmException( String message, Throwable cause ) { Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFile.java Wed Aug 13 06:27:27 2008 @@ -61,6 +61,7 @@ // Comparable Implementation // ---------------------------------------------------------------------- + /** {@inheritDoc} */ public int compareTo( Object other ) { return ( (ScmFile) other ).getPath().compareTo( path ); @@ -70,6 +71,7 @@ // Object overrides // ---------------------------------------------------------------------- + /** {@inheritDoc} */ public boolean equals( Object other ) { if ( !( other instanceof ScmFile ) ) @@ -80,11 +82,13 @@ return ( (ScmFile) other ).getPath().equals( path ); } + /** {@inheritDoc} */ public int hashCode() { return path.hashCode(); } + /** {@inheritDoc} */ public String toString() { return "[" + path + ":" + status + "]"; Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileSet.java Wed Aug 13 06:27:27 2008 @@ -74,7 +74,7 @@ * @param includes Ant pattern for files to include * @param excludes Ant pattern for files to exclude, * if null DEFAULT_EXCLUDES is used, else DEFAULT_EXCLUDES is added. - * @throws IOException + * @throws IOException if any */ public ScmFileSet( File basedir, String includes, String excludes ) throws IOException @@ -98,7 +98,7 @@ * * @param basedir directory files are relative to * @param includes Ant pattern for files to include - * @throws IOException + * @throws IOException if any * @since 1.0 */ public ScmFileSet( File basedir, String includes ) @@ -172,6 +172,7 @@ return this.files; } + /** {@inheritDoc} */ public String toString() { return "basedir = " + basedir + "; files = " + files; Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmFileStatus.java Wed Aug 13 06:27:27 2008 @@ -37,14 +37,14 @@ /** * File is added to the working tree and does not yet exist in the repository */ - public final static ScmFileStatus ADDED = new ScmFileStatus( "added" ); + public static final ScmFileStatus ADDED = new ScmFileStatus( "added" ); /** * File is removed from the working tree thus not revisioned anymore.
* The file is still present in the repository.
* The file could be deleted from the filesystem depending on the provider. */ - public final static ScmFileStatus DELETED = new ScmFileStatus( "deleted" ); + public static final ScmFileStatus DELETED = new ScmFileStatus( "deleted" ); /** * The file has been modified in the working tree. @@ -59,29 +59,29 @@ /** * File from working tree is checked into the repository */ - public final static ScmFileStatus CHECKED_IN = new ScmFileStatus( "checked-in" ); + public static final ScmFileStatus CHECKED_IN = new ScmFileStatus( "checked-in" ); /** * File is checked out from the repository and into the working tree */ - public final static ScmFileStatus CHECKED_OUT = new ScmFileStatus( "checked-out" ); + public static final ScmFileStatus CHECKED_OUT = new ScmFileStatus( "checked-out" ); /** * The file in the working tree has differences to the one in repository that * conflicts ie. it cannot automatically be merged. */ - public final static ScmFileStatus CONFLICT = new ScmFileStatus( "conflict" ); + public static final ScmFileStatus CONFLICT = new ScmFileStatus( "conflict" ); /** * The file in the working tree has been updated with changes from the repository. */ - public final static ScmFileStatus PATCHED = new ScmFileStatus( "patched" ); + public static final ScmFileStatus PATCHED = new ScmFileStatus( "patched" ); /** * The file is added, removed or updated from the repository, thus its * up-to-date with the version in the repository. See also isUpdate() */ - public final static ScmFileStatus UPDATED = new ScmFileStatus( "updated" ); + public static final ScmFileStatus UPDATED = new ScmFileStatus( "updated" ); /** * The file is part of a tag. @@ -108,6 +108,7 @@ this.name = name; } + /** {@inheritDoc} */ public String toString() { return name; @@ -148,6 +149,8 @@ * that the working tree has changed.
* An update indicates the opposite, that the repository was changed compared to * the working tree and that it is now synchronized unless there are conflicts. + * + * @return true if the status is conflict, updated or patched. */ public boolean isUpdate() { Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmResult.java Wed Aug 13 06:27:27 2008 @@ -38,6 +38,8 @@ *

* Typically used from derived classes when wrapping a ScmResult * into a specific type eg. AddScmResult + * + * @param scmResult not null */ public ScmResult( ScmResult scmResult ) { Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRevision.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRevision.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRevision.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmRevision.java Wed Aug 13 06:27:27 2008 @@ -26,6 +26,7 @@ public class ScmRevision extends AbstractScmVersion { + /** {@inheritDoc} */ public String getType() { return "Revision"; Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTag.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTag.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTag.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmTag.java Wed Aug 13 06:27:27 2008 @@ -26,11 +26,15 @@ public class ScmTag extends ScmBranch { + /** {@inheritDoc} */ public String getType() { return "Tag"; } + /** + * @param name not null + */ public ScmTag( String name ) { super( name ); Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmVersion.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmVersion.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmVersion.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ScmVersion.java Wed Aug 13 06:27:27 2008 @@ -25,9 +25,18 @@ */ public interface ScmVersion { + /** + * @return the Version ttype like branch + */ String getType(); + /** + * @return the Version name + */ String getName(); + /** + * @param name new Version name could be null + */ void setName( String name ); } Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/AbstractCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/AbstractCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/AbstractCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/AbstractCommand.java Wed Aug 13 06:27:27 2008 @@ -40,6 +40,7 @@ CommandParameters parameters ) throws ScmException; + /** {@inheritDoc} */ public final ScmResult execute( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException { @@ -63,17 +64,13 @@ } } - /** - * @see org.apache.maven.scm.command.Command#getLogger() - */ + /** {@inheritDoc} */ public final ScmLogger getLogger() { return logger; } - /** - * @see org.apache.maven.scm.command.Command#setLogger(org.apache.maven.scm.log.ScmLogger) - */ + /** {@inheritDoc} */ public final void setLogger( ScmLogger logger ) { this.logger = logger; Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/Command.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/Command.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/Command.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/Command.java Wed Aug 13 06:27:27 2008 @@ -33,12 +33,26 @@ */ public interface Command { + /** Plexus component key */ String ROLE = Command.class.getName(); + /** + * @param repository not null + * @param fileSet not null + * @param parameters could be null + * @return the result object + * @throws ScmException if any + */ ScmResult execute( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException; + /** + * @param logger not null + */ void setLogger( ScmLogger logger ); + /** + * @return the current logger + */ ScmLogger getLogger(); } Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AbstractAddCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AbstractAddCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AbstractAddCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/add/AbstractAddCommand.java Wed Aug 13 06:27:27 2008 @@ -38,6 +38,7 @@ String message, boolean binary ) throws ScmException; + /** {@inheritDoc} */ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/branch/AbstractBranchCommand.java Wed Aug 13 06:27:27 2008 @@ -39,6 +39,7 @@ String branchName, String message ) throws ScmException; + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/changelog/AbstractChangeLogCommand.java Wed Aug 13 06:27:27 2008 @@ -53,6 +53,7 @@ throw new ScmException( "Unsupported method for this provider." ); } + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/AbstractCheckInCommand.java Wed Aug 13 06:27:27 2008 @@ -36,7 +36,7 @@ public abstract class AbstractCheckInCommand extends AbstractCommand { - public final static String NAME = "check-in"; + public static final String NAME = "check-in"; protected abstract CheckInScmResult executeCheckInCommand( ScmProviderRepository repository, ScmFileSet fileSet, String message, ScmVersion scmVersion ) Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/AbstractCheckOutCommand.java Wed Aug 13 06:27:27 2008 @@ -40,6 +40,7 @@ ScmVersion scmVersion ) throws ScmException; + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/diff/AbstractDiffCommand.java Wed Aug 13 06:27:27 2008 @@ -45,6 +45,7 @@ ScmVersion startRevision, ScmVersion endRevision ) throws ScmException; + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/AbstractEditCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/AbstractEditCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/AbstractEditCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/AbstractEditCommand.java Wed Aug 13 06:27:27 2008 @@ -27,11 +27,12 @@ import org.apache.maven.scm.provider.ScmProviderRepository; /** - * + * @version $Id$ */ public abstract class AbstractEditCommand extends AbstractCommand { + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/edit/EditScmResult.java Wed Aug 13 06:27:27 2008 @@ -23,6 +23,9 @@ import java.util.List; +/** + * @version $Id$ + */ public class EditScmResult extends ScmResult { Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/AbstractExportCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/AbstractExportCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/AbstractExportCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/export/AbstractExportCommand.java Wed Aug 13 06:27:27 2008 @@ -39,6 +39,7 @@ ScmVersion scmVersion, String outputDirectory ) throws ScmException; + /** {@inheritDoc} */ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/AbstractListCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/AbstractListCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/AbstractListCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/list/AbstractListCommand.java Wed Aug 13 06:27:27 2008 @@ -48,6 +48,7 @@ boolean recursive, ScmVersion scmVersion ) throws ScmException; + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/AbstractLoginCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/AbstractLoginCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/AbstractLoginCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/login/AbstractLoginCommand.java Wed Aug 13 06:27:27 2008 @@ -37,9 +37,7 @@ CommandParameters parameters ) throws ScmException; - /** - * @see org.apache.maven.scm.command.AbstractCommand#executeCommand(org.apache.maven.scm.provider.ScmProviderRepository,org.apache.maven.scm.ScmFileSet,org.apache.maven.scm.CommandParameters) - */ + /** {@inheritDoc} */ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/AbstractRemoveCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/AbstractRemoveCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/AbstractRemoveCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remove/AbstractRemoveCommand.java Wed Aug 13 06:27:27 2008 @@ -39,6 +39,7 @@ String message ) throws ScmException; + /** {@inheritDoc} */ protected ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/AbstractStatusCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/AbstractStatusCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/AbstractStatusCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/status/AbstractStatusCommand.java Wed Aug 13 06:27:27 2008 @@ -36,6 +36,7 @@ protected abstract StatusScmResult executeStatusCommand( ScmProviderRepository repository, ScmFileSet fileSet ) throws ScmException; + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/tag/AbstractTagCommand.java Wed Aug 13 06:27:27 2008 @@ -39,6 +39,7 @@ String tagName, String message ) throws ScmException; + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/AbstractUnEditCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/AbstractUnEditCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/AbstractUnEditCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/AbstractUnEditCommand.java Wed Aug 13 06:27:27 2008 @@ -27,11 +27,12 @@ import org.apache.maven.scm.provider.ScmProviderRepository; /** - * + * @version $Id$ */ public abstract class AbstractUnEditCommand extends AbstractCommand { + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unedit/UnEditScmResult.java Wed Aug 13 06:27:27 2008 @@ -23,6 +23,9 @@ import java.util.List; +/** + * @version $Id$ + */ public class UnEditScmResult extends ScmResult { Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unlock/AbstractUnlockCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unlock/AbstractUnlockCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unlock/AbstractUnlockCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/unlock/AbstractUnlockCommand.java Wed Aug 13 06:27:27 2008 @@ -38,6 +38,7 @@ protected abstract ScmResult executeUnlockCommand( ScmProviderRepository repository, File workingDirectory ) throws ScmException; + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, File workingDirectory, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/update/AbstractUpdateCommand.java Wed Aug 13 06:27:27 2008 @@ -50,6 +50,7 @@ ScmVersion scmVersion ) throws ScmException; + /** {@inheritDoc} */ public ScmResult executeCommand( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters parameters ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/DefaultLog.java Wed Aug 13 06:27:27 2008 @@ -27,132 +27,99 @@ implements ScmLogger { - /** - * @see org.apache.maven.scm.log.ScmLogger#isDebugEnabled() - */ + /** {@inheritDoc} */ public boolean isDebugEnabled() { return false; } - /** - * @see org.apache.maven.scm.log.ScmLogger#debug(java.lang.String) - */ + /** {@inheritDoc} */ public void debug( String content ) { } - /** - * @see org.apache.maven.scm.log.ScmLogger#debug(java.lang.String,java.lang.Throwable) - */ + /** {@inheritDoc} */ public void debug( String content, Throwable error ) { } - /** - * @see org.apache.maven.scm.log.ScmLogger#debug(java.lang.Throwable) - */ + /** {@inheritDoc} */ public void debug( Throwable error ) { } - /** - * @see org.apache.maven.scm.log.ScmLogger#isInfoEnabled() - */ + /** {@inheritDoc} */ public boolean isInfoEnabled() { return true; } - /** - * @see org.apache.maven.scm.log.ScmLogger#info(java.lang.String) - */ + /** {@inheritDoc} */ public void info( String content ) { System.out.println( content ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#info(java.lang.String,java.lang.Throwable) - */ + /** {@inheritDoc} */ public void info( String content, Throwable error ) { System.out.println( content ); error.printStackTrace(); } - /** - * @see org.apache.maven.scm.log.ScmLogger#info(java.lang.Throwable) - */ + /** {@inheritDoc} */ public void info( Throwable error ) { error.printStackTrace(); } - /** - * @see org.apache.maven.scm.log.ScmLogger#isWarnEnabled() - */ + /** {@inheritDoc} */ public boolean isWarnEnabled() { return true; } - /** - * @see org.apache.maven.scm.log.ScmLogger#warn(java.lang.String) - */ + /** {@inheritDoc} */ public void warn( String content ) { System.out.println( content ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#warn(java.lang.String,java.lang.Throwable) - */ + /** {@inheritDoc} */ public void warn( String content, Throwable error ) { System.out.println( content ); error.printStackTrace(); } - /** - * @see org.apache.maven.scm.log.ScmLogger#warn(java.lang.Throwable) - */ + /** {@inheritDoc} */ public void warn( Throwable error ) { error.printStackTrace(); } - /** - * @see org.apache.maven.scm.log.ScmLogger#isErrorEnabled() - */ + /** {@inheritDoc} */ public boolean isErrorEnabled() { return true; } - /** - * @see org.apache.maven.scm.log.ScmLogger#error(java.lang.String) - */ + /** {@inheritDoc} */ public void error( String content ) { System.out.print( "[ERROR] " + content ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#error(java.lang.String,java.lang.Throwable) - */ + /** {@inheritDoc} */ public void error( String content, Throwable error ) { System.out.println( "[ERROR] " + content ); error.printStackTrace(); } - /** - * @see org.apache.maven.scm.log.ScmLogger#error(java.lang.Throwable) - */ + /** {@inheritDoc} */ public void error( Throwable error ) { error.printStackTrace(); } - } Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/log/ScmLogDispatcher.java Wed Aug 13 06:27:27 2008 @@ -37,9 +37,7 @@ listeners.add( logger ); } - /** - * @see org.apache.maven.scm.log.ScmLogger#debug(java.lang.String,java.lang.Throwable) - */ + /** {@inheritDoc} */ public void debug( String content, Throwable error ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -50,9 +48,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#debug(java.lang.String) - */ + /** {@inheritDoc} */ public void debug( String content ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -63,9 +59,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#debug(java.lang.Throwable) - */ + /** {@inheritDoc} */ public void debug( Throwable error ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -76,9 +70,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#error(java.lang.String,java.lang.Throwable) - */ + /** {@inheritDoc} */ public void error( String content, Throwable error ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -89,9 +81,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#error(java.lang.String) - */ + /** {@inheritDoc} */ public void error( String content ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -102,9 +92,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#error(java.lang.Throwable) - */ + /** {@inheritDoc} */ public void error( Throwable error ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -115,9 +103,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#info(java.lang.String,java.lang.Throwable) - */ + /** {@inheritDoc} */ public void info( String content, Throwable error ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -128,9 +114,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#info(java.lang.String) - */ + /** {@inheritDoc} */ public void info( String content ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -141,9 +125,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#info(java.lang.Throwable) - */ + /** {@inheritDoc} */ public void info( Throwable error ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -154,9 +136,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#isDebugEnabled() - */ + /** {@inheritDoc} */ public boolean isDebugEnabled() { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -172,9 +152,7 @@ return false; } - /** - * @see org.apache.maven.scm.log.ScmLogger#isErrorEnabled() - */ + /** {@inheritDoc} */ public boolean isErrorEnabled() { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -190,9 +168,7 @@ return false; } - /** - * @see org.apache.maven.scm.log.ScmLogger#isInfoEnabled() - */ + /** {@inheritDoc} */ public boolean isInfoEnabled() { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -208,9 +184,7 @@ return false; } - /** - * @see org.apache.maven.scm.log.ScmLogger#isWarnEnabled() - */ + /** {@inheritDoc} */ public boolean isWarnEnabled() { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -226,9 +200,7 @@ return false; } - /** - * @see org.apache.maven.scm.log.ScmLogger#warn(java.lang.String,java.lang.Throwable) - */ + /** {@inheritDoc} */ public void warn( String content, Throwable error ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -239,9 +211,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#warn(java.lang.String) - */ + /** {@inheritDoc} */ public void warn( String content ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -252,9 +222,7 @@ } } - /** - * @see org.apache.maven.scm.log.ScmLogger#warn(java.lang.Throwable) - */ + /** {@inheritDoc} */ public void warn( Throwable error ) { for ( Iterator i = listeners.iterator(); i.hasNext(); ) @@ -264,5 +232,4 @@ logger.warn( error ); } } - } Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/AbstractScmManager.java Wed Aug 13 06:27:27 2008 @@ -99,6 +99,7 @@ // ScmManager Implementation // ---------------------------------------------------------------------- + /** {@inheritDoc} */ public ScmProvider getProviderByUrl( String scmUrl ) throws ScmRepositoryException, NoSuchScmProviderException { @@ -112,11 +113,13 @@ return getProviderByType( providerType ); } + /** {@inheritDoc} */ public void setScmProviderImplementation( String providerType, String providerImplementation ) { userProviderTypes.put( providerType, providerImplementation ); } + /** {@inheritDoc} */ public ScmProvider getProviderByType( String providerType ) throws NoSuchScmProviderException { @@ -158,6 +161,7 @@ return scmProvider; } + /** {@inheritDoc} */ public ScmProvider getProviderByRepository( ScmRepository repository ) throws NoSuchScmProviderException { @@ -168,6 +172,7 @@ // Repository // ---------------------------------------------------------------------- + /** {@inheritDoc} */ public ScmRepository makeScmRepository( String scmUrl ) throws ScmRepositoryException, NoSuchScmProviderException { @@ -246,6 +251,7 @@ return scmUrl; } + /** {@inheritDoc} */ public ScmRepository makeProviderScmRepository( String providerType, File path ) throws ScmRepositoryException, UnknownRepositoryStructure, NoSuchScmProviderException { @@ -261,6 +267,7 @@ return new ScmRepository( providerType, providerRepository ); } + /** {@inheritDoc} */ public List validateScmRepository( String scmUrl ) { List messages = new ArrayList(); @@ -297,45 +304,35 @@ return messages; } - /** - * - */ + /** {@inheritDoc} */ public AddScmResult add( ScmRepository repository, ScmFileSet fileSet ) throws ScmException { return this.getProviderByRepository( repository ).add( repository, fileSet ); } - /** - * - */ + /** {@inheritDoc} */ public AddScmResult add( ScmRepository repository, ScmFileSet fileSet, String message ) throws ScmException { return this.getProviderByRepository( repository ).add( repository, fileSet, message ); } - /** - * - */ + /** {@inheritDoc} */ public BranchScmResult branch( ScmRepository repository, ScmFileSet fileSet, String branchName ) throws ScmException { return this.getProviderByRepository( repository ).branch( repository, fileSet, branchName ); } - /** - * - */ + /** {@inheritDoc} */ public BranchScmResult branch( ScmRepository repository, ScmFileSet fileSet, String branchName, String message ) throws ScmException { return this.getProviderByRepository( repository ).branch( repository, fileSet, branchName, message ); } - /** - * - */ + /** {@inheritDoc} */ public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, Date startDate, Date endDate, int numDays, ScmBranch branch ) throws ScmException @@ -344,9 +341,7 @@ branch ); } - /** - * - */ + /** {@inheritDoc} */ public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, Date startDate, Date endDate, int numDays, ScmBranch branch, String datePattern ) throws ScmException @@ -355,9 +350,7 @@ branch, datePattern ); } - /** - * - */ + /** {@inheritDoc} */ public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, ScmVersion startVersion, ScmVersion endVersion ) throws ScmException @@ -365,9 +358,7 @@ return this.getProviderByRepository( repository ).changeLog( repository, fileSet, startVersion, endVersion ); } - /** - * - */ + /** {@inheritDoc} */ public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, ScmVersion startRevision, ScmVersion endRevision, String datePattern ) throws ScmException @@ -376,54 +367,42 @@ datePattern ); } - /** - * - */ + /** {@inheritDoc} */ public CheckInScmResult checkIn( ScmRepository repository, ScmFileSet fileSet, String message ) throws ScmException { return this.getProviderByRepository( repository ).checkIn( repository, fileSet, message ); } - /** - * - */ + /** {@inheritDoc} */ public CheckInScmResult checkIn( ScmRepository repository, ScmFileSet fileSet, ScmVersion revision, String message ) throws ScmException { return this.getProviderByRepository( repository ).checkIn( repository, fileSet, revision, message ); } - /** - * - */ + /** {@inheritDoc} */ public CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet ) throws ScmException { return this.getProviderByRepository( repository ).checkOut( repository, fileSet ); } - /** - * - */ + /** {@inheritDoc} */ public CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet, ScmVersion version ) throws ScmException { return this.getProviderByRepository( repository ).checkOut( repository, fileSet, version ); } - /** - * - */ + /** {@inheritDoc} */ public CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet, boolean recursive ) throws ScmException { return this.getProviderByRepository( repository ).checkOut( repository, fileSet, recursive ); } - /** - * - */ + /** {@inheritDoc} */ public CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet, ScmVersion version, boolean recursive ) throws ScmException @@ -431,9 +410,7 @@ return this.getProviderByRepository( repository ).checkOut( repository, fileSet, version, recursive ); } - /** - * - */ + /** {@inheritDoc} */ public DiffScmResult diff( ScmRepository repository, ScmFileSet fileSet, ScmVersion startVersion, ScmVersion endVersion ) throws ScmException @@ -441,36 +418,28 @@ return this.getProviderByRepository( repository ).diff( repository, fileSet, startVersion, endVersion ); } - /** - * - */ + /** {@inheritDoc} */ public EditScmResult edit( ScmRepository repository, ScmFileSet fileSet ) throws ScmException { return this.getProviderByRepository( repository ).edit( repository, fileSet ); } - /** - * - */ + /** {@inheritDoc} */ public ExportScmResult export( ScmRepository repository, ScmFileSet fileSet ) throws ScmException { return this.getProviderByRepository( repository ).export( repository, fileSet ); } - /** - * - */ + /** {@inheritDoc} */ public ExportScmResult export( ScmRepository repository, ScmFileSet fileSet, ScmVersion version ) throws ScmException { return this.getProviderByRepository( repository ).export( repository, fileSet, version ); } - /** - * - */ + /** {@inheritDoc} */ public ExportScmResult export( ScmRepository repository, ScmFileSet fileSet, String outputDirectory ) throws ScmException { @@ -478,9 +447,7 @@ outputDirectory ); } - /** - * - */ + /** {@inheritDoc} */ public ExportScmResult export( ScmRepository repository, ScmFileSet fileSet, ScmVersion version, String outputDirectory ) throws ScmException @@ -488,90 +455,70 @@ return this.getProviderByRepository( repository ).export( repository, fileSet, version, outputDirectory ); } - /** - * - */ + /** {@inheritDoc} */ public ListScmResult list( ScmRepository repository, ScmFileSet fileSet, boolean recursive, ScmVersion version ) throws ScmException { return this.getProviderByRepository( repository ).list( repository, fileSet, recursive, version ); } - /** - * - */ + /** {@inheritDoc} */ public RemoveScmResult remove( ScmRepository repository, ScmFileSet fileSet, String message ) throws ScmException { return this.getProviderByRepository( repository ).remove( repository, fileSet, message ); } - /** - * - */ + /** {@inheritDoc} */ public StatusScmResult status( ScmRepository repository, ScmFileSet fileSet ) throws ScmException { return this.getProviderByRepository( repository ).status( repository, fileSet ); } - /** - * - */ + /** {@inheritDoc} */ public TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, String tagName ) throws ScmException { return this.getProviderByRepository( repository ).tag( repository, fileSet, tagName ); } - /** - * - */ + /** {@inheritDoc} */ public TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, String tagName, String message ) throws ScmException { return this.getProviderByRepository( repository ).tag( repository, fileSet, tagName, message ); } - /** - * - */ + /** {@inheritDoc} */ public UnEditScmResult unedit( ScmRepository repository, ScmFileSet fileSet ) throws ScmException { return this.getProviderByRepository( repository ).unedit( repository, fileSet ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet ) throws ScmException { return this.getProviderByRepository( repository ).update( repository, fileSet ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version ) throws ScmException { return this.getProviderByRepository( repository ).update( repository, fileSet, version ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, boolean runChangelog ) throws ScmException { return this.getProviderByRepository( repository ).update( repository, fileSet, runChangelog ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version, boolean runChangelog ) throws ScmException @@ -579,18 +526,14 @@ return this.getProviderByRepository( repository ).update( repository, fileSet, version, runChangelog ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, String datePattern ) throws ScmException { return this.getProviderByRepository( repository ).update( repository, fileSet, (ScmVersion) null, datePattern ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version, String datePattern ) throws ScmException @@ -598,27 +541,21 @@ return this.getProviderByRepository( repository ).update( repository, fileSet, version, datePattern ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, Date lastUpdate ) throws ScmException { return this.getProviderByRepository( repository ).update( repository, fileSet, (ScmVersion) null, lastUpdate ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version, Date lastUpdate ) throws ScmException { return this.getProviderByRepository( repository ).update( repository, fileSet, version, lastUpdate ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, Date lastUpdate, String datePattern ) throws ScmException { @@ -626,9 +563,7 @@ datePattern ); } - /** - * - */ + /** {@inheritDoc} */ public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version, Date lastUpdate, String datePattern ) throws ScmException Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/BasicScmManager.java Wed Aug 13 06:27:27 2008 @@ -29,6 +29,7 @@ public class BasicScmManager extends AbstractScmManager { + /** {@inheritDoc} */ protected ScmLogger getScmLogger() { return new DefaultLog(); Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/NoSuchScmProviderException.java URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/NoSuchScmProviderException.java?rev=685539&r1=685538&r2=685539&view=diff ============================================================================== --- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/NoSuchScmProviderException.java (original) +++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/manager/NoSuchScmProviderException.java Wed Aug 13 06:27:27 2008 @@ -29,6 +29,8 @@ public class NoSuchScmProviderException extends ScmException { + static final long serialVersionUID = 4770645185214496323L; + private String providerName; public NoSuchScmProviderException( String providerName )