Author: aheritier
Date: Mon Sep 26 15:42:33 2005
New Revision: 291772
URL: http://svn.apache.org/viewcvs?rev=291772&view=rev
Log:
Apply Mergere code style
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmPatternBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java?rev=291772&r1=291771&r2=291772&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
Mon Sep 26 15:42:33 2005
@@ -17,19 +17,20 @@
* ====================================================================
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.add.AddScmResult;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.scm.ScmManager;
-import java.io.File;
-
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
*/
-public class ScmAddBean extends ScmPatternBean
+public class ScmAddBean
+ extends ScmPatternBean
{
private String message;
@@ -40,7 +41,8 @@
ScmRepository repository = getScmRepository( scmManager );
- AddScmResult result = scmManager.add( repository, new ScmFileSet( new
File( getWorkingDirectory() ), getIncludes(), getExcludes() ) );
+ AddScmResult result = scmManager.add( repository, new ScmFileSet( new
File( getWorkingDirectory() ),
+
getIncludes(), getExcludes() ) );
checkResult( result );
}
@@ -55,4 +57,3 @@
}
}
-
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java?rev=291772&r1=291771&r2=291772&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
Mon Sep 26 15:42:33 2005
@@ -17,22 +17,22 @@
* ====================================================================
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.repository.ScmRepositoryException;
-import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
-import
org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
import org.apache.maven.scm.command.checkout.CheckOutScmResult;
import org.apache.maven.scm.command.tag.TagScmResult;
import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.codehaus.plexus.embed.Embedder;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.scm.ScmManager;
import org.apache.maven.scm.log.DefaultLog;
+import
org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
+import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
+import org.codehaus.plexus.embed.Embedder;
import org.codehaus.plexus.scm.NoSuchScmProviderException;
-
-import java.io.File;
+import org.codehaus.plexus.scm.ScmManager;
+import org.codehaus.plexus.util.FileUtils;
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
@@ -94,7 +94,8 @@
}
checkoutDirectory.mkdirs();
- CheckOutScmResult result = scmManager.checkOut( repository, new
ScmFileSet( checkoutDirectory.getAbsoluteFile() ), tag );
+ CheckOutScmResult result = scmManager.checkOut( repository,
+ new ScmFileSet(
checkoutDirectory.getAbsoluteFile() ), tag );
checkResult( result );
}
@@ -121,10 +122,11 @@
svnRepo.setTagBase( tagBase );
}
}
-
+
if ( repository.getProvider().equals( "starteam" ) )
{
- StarteamScmProviderRepository starteamRepo =
(StarteamScmProviderRepository) repository.getProviderRepository();
+ StarteamScmProviderRepository starteamRepo =
(StarteamScmProviderRepository) repository
+ .getProviderRepository();
if ( username != null && username.length() > 0 )
{
@@ -135,7 +137,7 @@
starteamRepo.setPassword( password );
}
}
-
+
return repository;
}
@@ -145,7 +147,7 @@
Embedder embedder = getEmbedder();
ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE
);
scmManager.addListener( new DefaultLog() );
-
+
return scmManager;
}
@@ -257,4 +259,3 @@
}
}
-
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java?rev=291772&r1=291771&r2=291772&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
Mon Sep 26 15:42:33 2005
@@ -17,19 +17,20 @@
* ====================================================================
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.checkin.CheckInScmResult;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.scm.ScmManager;
-import java.io.File;
-
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
*/
-public class ScmCheckinBean extends ScmPatternBean
+public class ScmCheckinBean
+ extends ScmPatternBean
{
private String message;
@@ -57,4 +58,3 @@
}
}
-
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java?rev=291772&r1=291771&r2=291772&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
Mon Sep 26 15:42:33 2005
@@ -17,24 +17,26 @@
* ====================================================================
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.diff.DiffScmResult;
import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.embed.Embedder;
-import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.scm.ScmManager;
-
-import java.io.File;
+import org.codehaus.plexus.util.FileUtils;
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
*/
-public class ScmDiffBean extends ScmPatternBean
+public class ScmDiffBean
+ extends ScmPatternBean
{
private String patchFile;
+
private String startRevision;
+
private String endRevision;
public void diff()
@@ -61,23 +63,23 @@
return patchFile;
}
- public String getStartRevision()
- {
- return startRevision;
- }
-
- public void setStartRevision(String startRevision)
- {
- this.startRevision = startRevision;
- }
-
- public String getEndRevision()
- {
- return endRevision;
- }
-
- public void setEndRevision(String endRevision)
- {
- this.endRevision = endRevision;
- }
+ public String getStartRevision()
+ {
+ return startRevision;
+ }
+
+ public void setStartRevision( String startRevision )
+ {
+ this.startRevision = startRevision;
+ }
+
+ public String getEndRevision()
+ {
+ return endRevision;
+ }
+
+ public void setEndRevision( String endRevision )
+ {
+ this.endRevision = endRevision;
+ }
}
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmPatternBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmPatternBean.java?rev=291772&r1=291771&r2=291772&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmPatternBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmPatternBean.java
Mon Sep 26 15:42:33 2005
@@ -22,7 +22,8 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
*/
-public class ScmPatternBean extends ScmBean
+public class ScmPatternBean
+ extends ScmBean
{
private String includes;
@@ -48,4 +49,3 @@
return excludes;
}
}
-
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java?rev=291772&r1=291771&r2=291772&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
Mon Sep 26 15:42:33 2005
@@ -17,22 +17,23 @@
* ====================================================================
*/
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.status.StatusScmResult;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.scm.ScmManager;
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
*/
-public class ScmStatusBean extends ScmBean
+public class ScmStatusBean
+ extends ScmBean
{
private List changedFiles;
@@ -52,10 +53,8 @@
for ( Iterator i = changedFiles.iterator(); i.hasNext(); )
{
ScmFile f = (ScmFile) i.next();
- if ( f.getPath().equals( "project.xml" ) ||
- f.getPath().equals( "project.xml.backup" ) ||
- f.getPath().equals( "xdocs/changes.xml" ) ||
- f.getPath().equals( "xdocs/changes.xml.backup" ) )
+ if ( f.getPath().equals( "project.xml" ) || f.getPath().equals(
"project.xml.backup" )
+ || f.getPath().equals( "xdocs/changes.xml" ) ||
f.getPath().equals( "xdocs/changes.xml.backup" ) )
{
i.remove();
}
@@ -67,4 +66,3 @@
return changedFiles;
}
}
-
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java?rev=291772&r1=291771&r2=291772&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
Mon Sep 26 15:42:33 2005
@@ -17,19 +17,20 @@
* ====================================================================
*/
+import java.io.File;
+
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.update.UpdateScmResult;
import org.apache.maven.scm.repository.ScmRepository;
import org.codehaus.plexus.scm.ScmManager;
-import java.io.File;
-
/**
* A bean for using the Maven SCM API because wrangling objects in Jelly is no
fun.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Brett Porter</a>
*/
-public class ScmUpdateBean extends ScmPatternBean
+public class ScmUpdateBean
+ extends ScmPatternBean
{
private String message;
@@ -40,11 +41,10 @@
ScmRepository repository = getScmRepository( scmManager );
- UpdateScmResult result = scmManager.update( repository,
- new ScmFileSet( new File(
getWorkingDirectory() ), getIncludes(), getExcludes() ),
+ UpdateScmResult result = scmManager.update( repository, new
ScmFileSet( new File( getWorkingDirectory() ),
+
getIncludes(), getExcludes() ),
getTag() );
checkResult( result );
}
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
