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 2012/02/28 00:16:23 UTC
svn commit: r1294391 - in
/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm: ./
command/checkin/ command/checkout/ command/remoteinfo/ util/
Author: hboutemy
Date: Mon Feb 27 23:16:22 2012
New Revision: 1294391
URL: http://svn.apache.org/viewvc?rev=1294391&view=rev
Log:
fixed typos and code formatting
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/ChangeFile.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/command/checkin/CheckInScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/AbstractRemoteInfoCommand.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.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=1294391&r1=1294390&r2=1294391&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 Mon Feb 27 23:16:22 2012
@@ -21,7 +21,6 @@ package org.apache.maven.scm;
import java.io.Serializable;
-
/**
* @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
* @version $Id$
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java?rev=1294391&r1=1294390&r2=1294391&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/ChangeFile.java Mon Feb 27 23:16:22 2012
@@ -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;
+
/**
* A set of information about revisions of a file as returned by CVS's log
* command
@@ -46,7 +46,7 @@ public class ChangeFile
/**
* edit type on the file
- * note: perhaps we should use a different type, ideally enum ? this one seems to target quite different usecases ...
+ * note: perhaps we should use a different type, ideally enum? this one seems to target quite different usecases ...
* @since 1.7
*/
private ScmFileStatus action;
@@ -106,20 +106,24 @@ public class ChangeFile
this.name = name;
}
- public String getOriginalName() {
+ public String getOriginalName()
+ {
return originalName;
}
- public void setOriginalName( String originalName ) {
+ public void setOriginalName( String originalName )
+ {
this.originalName = originalName;
}
- public String getOriginalRevision() {
+ public String getOriginalRevision()
+ {
return originalRevision;
}
- public void setOriginalRevision(String originalRevision) {
+ public void setOriginalRevision( String originalRevision )
+ {
this.originalRevision = originalRevision;
}
@@ -143,11 +147,13 @@ public class ChangeFile
this.revision = revision;
}
- public ScmFileStatus getAction() {
+ public ScmFileStatus getAction()
+ {
return action;
}
- public void setAction( ScmFileStatus action ) {
+ public void setAction( ScmFileStatus action )
+ {
this.action = action;
}
@@ -173,7 +179,7 @@ public class ChangeFile
if ( getOriginalName() != null )
{
- buffer.append( ", originalName" ).append( getOriginalName() );
+ buffer.append( ", originalName=" ).append( getOriginalName() );
}
if ( getOriginalRevision() != null )
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=1294391&r1=1294390&r2=1294391&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 Mon Feb 27 23:16:22 2012
@@ -432,26 +432,32 @@ public class ChangeSet
this.revision = revision;
}
- public String getParentRevision() {
+ public String getParentRevision()
+ {
return parentRevision;
}
- public void setParentRevision(String parentRevision) {
+ public void setParentRevision( String parentRevision )
+ {
this.parentRevision = parentRevision;
}
- public void addMergedRevision(String mergedRevision) {
- if (mergedRevisions == null) {
+ public void addMergedRevision( String mergedRevision )
+ {
+ if ( mergedRevisions == null )
+ {
mergedRevisions = new LinkedHashSet<String>();
}
- mergedRevisions.add(mergedRevision);
+ mergedRevisions.add( mergedRevision );
}
- public Set<String> getMergedRevisions() {
- return mergedRevisions == null ? Collections.<String>emptySet() : mergedRevisions;
+ public Set<String> getMergedRevisions()
+ {
+ return mergedRevisions == null ? Collections.<String> emptySet() : mergedRevisions;
}
- public void setMergedRevisions(Set<String> mergedRevisions) {
+ public void setMergedRevisions( Set<String> mergedRevisions )
+ {
this.mergedRevisions = mergedRevisions;
}
@@ -461,9 +467,11 @@ public class ChangeSet
StringBuilder result = new StringBuilder( author == null ? " null " : author );
result.append( "\n" ).append( date == null ? "null " : date.toString() ).append( "\n" );
// parent(s)
- if ( parentRevision != null ) {
+ if ( parentRevision != null )
+ {
result.append( "parent: " ).append( parentRevision );
- if ( !mergedRevisions.isEmpty() ) {
+ if ( !mergedRevisions.isEmpty() )
+ {
result.append( " + " );
result.append( mergedRevisions );
}
@@ -506,7 +514,8 @@ public class ChangeSet
.append( author )
.append( "]]></author>\n" );
- if ( parentRevision != null) {
+ if ( parentRevision != null )
+ {
buffer.append( "\t\t<parent>" ).append( getParentRevision() ).append( "</parent>\n" );
}
for ( String mergedRevision : getMergedRevisions() )
@@ -531,8 +540,7 @@ public class ChangeSet
}
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>" ).append( file.getOriginalRevision() ).append( "</orig-revision>\n" );
}
buffer.append( "\t\t</file>\n" );
}
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java?rev=1294391&r1=1294390&r2=1294391&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkin/CheckInScmResult.java Mon Feb 27 23:16:22 2012
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmResult;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author Olivier Lamy
@@ -72,10 +71,9 @@ public class CheckInScmResult
this.checkedInFiles = checkedInFiles;
}
-
public List<ScmFile> getCheckedInFiles()
{
- if (this.checkedInFiles == null)
+ if ( this.checkedInFiles == null )
{
this.checkedInFiles = new ArrayList<ScmFile>();
}
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java?rev=1294391&r1=1294390&r2=1294391&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/checkout/CheckOutScmResult.java Mon Feb 27 23:16:22 2012
@@ -24,7 +24,6 @@ import java.util.List;
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmResult;
-
/**
* @author <a href="mailto:trygvis@inamo.no">Trygve Laugstøl</a>
* @author Olivier Lamy
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/AbstractRemoteInfoCommand.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/AbstractRemoteInfoCommand.java?rev=1294391&r1=1294390&r2=1294391&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/AbstractRemoteInfoCommand.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/AbstractRemoteInfoCommand.java Mon Feb 27 23:16:22 2012
@@ -1,4 +1,5 @@
package org.apache.maven.scm.command.remoteinfo;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java?rev=1294391&r1=1294390&r2=1294391&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/remoteinfo/RemoteInfoScmResult.java Mon Feb 27 23:16:22 2012
@@ -1,4 +1,5 @@
package org.apache.maven.scm.command.remoteinfo;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
Modified: maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java
URL: http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java?rev=1294391&r1=1294390&r2=1294391&view=diff
==============================================================================
--- maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java (original)
+++ maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/util/ThreadSafeDateFormat.java Mon Feb 27 23:16:22 2012
@@ -34,13 +34,14 @@ import java.util.Date;
* private static final ThreadSafeDateFormat DATE_FORMAT = new ThreadSafeDateFormat( DATE_PATTERN );
* </code>
*/
-public class ThreadSafeDateFormat extends DateFormat
+public class ThreadSafeDateFormat
+ extends DateFormat
{
private static final long serialVersionUID = 3786090697869963812L;
private final String m_sDateFormat;
- public ThreadSafeDateFormat(String sDateFormat)
+ public ThreadSafeDateFormat( String sDateFormat )
{
m_sDateFormat = sDateFormat;
}
@@ -50,10 +51,10 @@ public class ThreadSafeDateFormat extend
public SoftReference<SimpleDateFormat> get()
{
SoftReference<SimpleDateFormat> softRef = super.get();
- if (softRef == null || softRef.get() == null)
+ if ( softRef == null || softRef.get() == null )
{
- softRef = new SoftReference<SimpleDateFormat>( new SimpleDateFormat(m_sDateFormat) );
- super.set(softRef);
+ softRef = new SoftReference<SimpleDateFormat>( new SimpleDateFormat( m_sDateFormat ) );
+ super.set( softRef );
}
return softRef;
}
@@ -64,14 +65,13 @@ public class ThreadSafeDateFormat extend
return m_formatCache.get().get();
}
- public StringBuffer format(Date date, StringBuffer toAppendTo,
- FieldPosition fieldPosition)
+ public StringBuffer format( Date date, StringBuffer toAppendTo, FieldPosition fieldPosition )
{
- return getDateFormat().format(date, toAppendTo, fieldPosition);
+ return getDateFormat().format( date, toAppendTo, fieldPosition );
}
- public Date parse(String source, ParsePosition pos)
+ public Date parse( String source, ParsePosition pos )
{
- return getDateFormat().parse(source, pos);
+ return getDateFormat().parse( source, pos );
}
}