Author: olamy
Date: Tue Jan 25 23:53:11 2011
New Revision: 1063530
URL: http://svn.apache.org/viewvc?rev=1063530&view=rev
Log:
move some duplicate code in a common place
Added:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java
- copied, changed from r1062063,
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
- copied, changed from r1062063,
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
Copied:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java
(from r1062063,
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java)
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java?p2=maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java&p1=maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java&r1=1062063&r2=1063530&rev=1063530&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoItem.java
Tue Jan 25 23:53:11 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.scm.provider.git.command.info;
+package org.apache.maven.scm.command.info;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,11 @@ package org.apache.maven.scm.provider.gi
/**
* @author <a href="mailto:ken...@apache.org";>Kenney Westerhof</a>
+ * @author Olivier Lamy
* @version $Id$
+ * @since 1.5
*/
-public class GitInfoItem
+public class InfoItem
{
private String path;
Copied:
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
(from r1062063,
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java)
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java?p2=maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java&p1=maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java&r1=1062063&r2=1063530&rev=1063530&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-api/src/main/java/org/apache/maven/scm/command/info/InfoScmResult.java
Tue Jan 25 23:53:11 2011
@@ -1,4 +1,4 @@
-package org.apache.maven.scm.provider.svn.command.info;
+package org.apache.maven.scm.command.info;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,37 +26,43 @@ import java.util.List;
/**
* @author <a href="mailto:ken...@apache.org";>Kenney Westerhof</a>
+ * @author Olivier Lamy
* @version $Id$
*/
-public class SvnInfoScmResult
+public class InfoScmResult
extends ScmResult
{
private static final long serialVersionUID = 955993340040530451L;
- private List<SvnInfoItem> infoItems;
+ private List<InfoItem> infoItems;
- public SvnInfoScmResult( String commandLine, String providerMessage,
String commandOutput, boolean success )
+ public InfoScmResult( String commandLine, String providerMessage, String
commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
- infoItems = new ArrayList<SvnInfoItem>( 0 );
+ infoItems = new ArrayList<InfoItem>( 0 );
}
- public SvnInfoScmResult( String commandLine, List<SvnInfoItem> files )
+ public InfoScmResult( String commandLine, List<InfoItem> files )
{
super( commandLine, null, null, true );
this.infoItems = files;
}
- public SvnInfoScmResult( List<SvnInfoItem> files, ScmResult result )
+ public InfoScmResult( List<InfoItem> files, ScmResult result )
{
super( result );
this.infoItems = files;
}
- public List<SvnInfoItem> getInfoItems()
+ public InfoScmResult( ScmResult result )
+ {
+ super( result );
+ }
+
+ public List<InfoItem> getInfoItems()
{
return infoItems;
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java?rev=1063530&r1=1063529&r2=1063530&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoItem.java
Tue Jan 25 23:53:11 2011
@@ -1,5 +1,7 @@
package org.apache.maven.scm.provider.git.command.info;
+import org.apache.maven.scm.command.info.InfoItem;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -23,125 +25,8 @@ package org.apache.maven.scm.provider.gi
* @author <a href="mailto:ken...@apache.org";>Kenney Westerhof</a>
* @version $Id$
*/
-public class GitInfoItem
+public class GitInfoItem
+ extends InfoItem
{
- private String path;
-
- private String url;
-
- private String repositoryRoot;
-
- private String repositoryUUID;
-
- private String revision;
-
- private String nodeKind;
-
- private String schedule;
-
- private String lastChangedAuthor;
-
- private String lastChangedRevision;
-
- private String lastChangedDate;
-
- public String getPath()
- {
- return path;
- }
-
- public void setPath( String path )
- {
- this.path = path;
- }
-
- public String getURL()
- {
- return url;
- }
-
- public void setURL( String url )
- {
- this.url = url;
- }
-
- public String getRepositoryRoot()
- {
- return repositoryRoot;
- }
-
- public void setRepositoryRoot( String repositoryRoot )
- {
- this.repositoryRoot = repositoryRoot;
- }
-
- public String getRepositoryUUID()
- {
- return repositoryUUID;
- }
-
- public void setRepositoryUUID( String repositoryUUID )
- {
- this.repositoryUUID = repositoryUUID;
- }
-
- public String getRevision()
- {
- return revision;
- }
-
- public void setRevision( String revision )
- {
- this.revision = revision;
- }
-
- public String getNodeKind()
- {
- return nodeKind;
- }
-
- public void setNodeKind( String nodeKind )
- {
- this.nodeKind = nodeKind;
- }
-
- public String getSchedule()
- {
- return schedule;
- }
-
- public void setSchedule( String schedule )
- {
- this.schedule = schedule;
- }
-
- public String getLastChangedAuthor()
- {
- return lastChangedAuthor;
- }
-
- public void setLastChangedAuthor( String lastChangedAuthor )
- {
- this.lastChangedAuthor = lastChangedAuthor;
- }
-
- public String getLastChangedRevision()
- {
- return lastChangedRevision;
- }
-
- public void setLastChangedRevision( String lastChangedRevision )
- {
- this.lastChangedRevision = lastChangedRevision;
- }
-
- public String getLastChangedDate()
- {
- return lastChangedDate;
- }
-
- public void setLastChangedDate( String lastChangedDate )
- {
- this.lastChangedDate = lastChangedDate;
- }
+ // no op
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java?rev=1063530&r1=1063529&r2=1063530&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-git/maven-scm-provider-git-commons/src/main/java/org/apache/maven/scm/provider/git/command/info/GitInfoScmResult.java
Tue Jan 25 23:53:11 2011
@@ -19,45 +19,45 @@ package org.apache.maven.scm.provider.gi
* under the License.
*/
-import java.util.ArrayList;
import java.util.List;
import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.info.InfoScmResult;
/**
* @author <a href="mailto:ken...@apache.org";>Kenney Westerhof</a>
* @version $Id$
*/
public class GitInfoScmResult
- extends ScmResult
+ extends InfoScmResult
{
private static final long serialVersionUID = -1314905338508176675L;
- private List<GitInfoItem> infoItems;
+
public GitInfoScmResult( String commandLine, String providerMessage,
String commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
-
- infoItems = new ArrayList<GitInfoItem>( 0 );
}
public GitInfoScmResult( String commandLine, List<GitInfoItem> files )
{
super( commandLine, null, null, true );
- this.infoItems = files;
+ if ( files != null )
+ {
+ getInfoItems().addAll( files );
+ }
}
public GitInfoScmResult( List<GitInfoItem> files, ScmResult result )
{
super( result );
- this.infoItems = files;
+ if ( files != null )
+ {
+ getInfoItems().addAll( files );
+ }
}
- public List<GitInfoItem> getInfoItems()
- {
- return infoItems;
- }
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java?rev=1063530&r1=1063529&r2=1063530&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoItem.java
Tue Jan 25 23:53:11 2011
@@ -1,5 +1,7 @@
package org.apache.maven.scm.provider.svn.command.info;
+import org.apache.maven.scm.command.info.InfoItem;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -22,126 +24,10 @@ package org.apache.maven.scm.provider.sv
/**
* @author <a href="mailto:ken...@apache.org";>Kenney Westerhof</a>
* @version $Id$
+ * @deprecated use {@link InfoItem}
*/
-public class SvnInfoItem
+public class SvnInfoItem
+ extends InfoItem
{
- private String path;
-
- private String url;
-
- private String repositoryRoot;
-
- private String repositoryUUID;
-
- private String revision;
-
- private String nodeKind;
-
- private String schedule;
-
- private String lastChangedAuthor;
-
- private String lastChangedRevision;
-
- private String lastChangedDate;
-
- public String getPath()
- {
- return path;
- }
-
- public void setPath( String path )
- {
- this.path = path;
- }
-
- public String getURL()
- {
- return url;
- }
-
- public void setURL( String url )
- {
- this.url = url;
- }
-
- public String getRepositoryRoot()
- {
- return repositoryRoot;
- }
-
- public void setRepositoryRoot( String repositoryRoot )
- {
- this.repositoryRoot = repositoryRoot;
- }
-
- public String getRepositoryUUID()
- {
- return repositoryUUID;
- }
-
- public void setRepositoryUUID( String repositoryUUID )
- {
- this.repositoryUUID = repositoryUUID;
- }
-
- public String getRevision()
- {
- return revision;
- }
-
- public void setRevision( String revision )
- {
- this.revision = revision;
- }
-
- public String getNodeKind()
- {
- return nodeKind;
- }
-
- public void setNodeKind( String nodeKind )
- {
- this.nodeKind = nodeKind;
- }
-
- public String getSchedule()
- {
- return schedule;
- }
-
- public void setSchedule( String schedule )
- {
- this.schedule = schedule;
- }
-
- public String getLastChangedAuthor()
- {
- return lastChangedAuthor;
- }
-
- public void setLastChangedAuthor( String lastChangedAuthor )
- {
- this.lastChangedAuthor = lastChangedAuthor;
- }
-
- public String getLastChangedRevision()
- {
- return lastChangedRevision;
- }
-
- public void setLastChangedRevision( String lastChangedRevision )
- {
- this.lastChangedRevision = lastChangedRevision;
- }
-
- public String getLastChangedDate()
- {
- return lastChangedDate;
- }
-
- public void setLastChangedDate( String lastChangedDate )
- {
- this.lastChangedDate = lastChangedDate;
- }
+ // no op
}
Modified:
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
URL:
http://svn.apache.org/viewvc/maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java?rev=1063530&r1=1063529&r2=1063530&view=diff
==============================================================================
---
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
(original)
+++
maven/scm/trunk/maven-scm-providers/maven-scm-providers-svn/maven-scm-provider-svn-commons/src/main/java/org/apache/maven/scm/provider/svn/command/info/SvnInfoScmResult.java
Tue Jan 25 23:53:11 2011
@@ -19,45 +19,43 @@ package org.apache.maven.scm.provider.sv
* under the License.
*/
-import org.apache.maven.scm.ScmResult;
-
-import java.util.ArrayList;
import java.util.List;
+import org.apache.maven.scm.ScmResult;
+import org.apache.maven.scm.command.info.InfoScmResult;
+
/**
* @author <a href="mailto:ken...@apache.org";>Kenney Westerhof</a>
* @version $Id$
+ * @deprecated use {@link InfoScmResult}
*/
public class SvnInfoScmResult
- extends ScmResult
+ extends InfoScmResult
{
private static final long serialVersionUID = 955993340040530451L;
- private List<SvnInfoItem> infoItems;
-
+
public SvnInfoScmResult( String commandLine, String providerMessage,
String commandOutput, boolean success )
{
super( commandLine, providerMessage, commandOutput, success );
-
- infoItems = new ArrayList<SvnInfoItem>( 0 );
}
public SvnInfoScmResult( String commandLine, List<SvnInfoItem> files )
{
super( commandLine, null, null, true );
-
- this.infoItems = files;
+ if ( files != null )
+ {
+ getInfoItems().addAll( files );
+ }
}
public SvnInfoScmResult( List<SvnInfoItem> files, ScmResult result )
{
super( result );
- this.infoItems = files;
- }
-
- public List<SvnInfoItem> getInfoItems()
- {
- return infoItems;
+ if ( files != null )
+ {
+ getInfoItems().addAll( files );
+ }
}
}
