maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject [5/6] git commit: [SCM-750] checkin policies
Date Sun, 25 May 2014 19:47:41 GMT
[SCM-750] checkin policies


Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/8ac5588a
Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/8ac5588a
Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/8ac5588a

Branch: refs/heads/master
Commit: 8ac5588aec3df73d585767e7e955591e44446711
Parents: c161640
Author: OhadR <ohadr.developer@gmail.com>
Authored: Sun May 25 00:41:07 2014 +0300
Committer: Hervé Boutemy <hboutemy@apache.org>
Committed: Sun May 25 21:32:29 2014 +0200

----------------------------------------------------------------------
 .../apache/maven/scm/provider/tfs/TfsScmProvider.java   |  4 ++--
 .../scm/provider/tfs/TfsScmProviderRepository.java      | 12 ++++++------
 .../scm/provider/tfs/command/TfsCheckInCommand.java     |  9 ++++-----
 .../maven/scm/provider/tfs/command/TfsCommandTest.java  |  2 +-
 4 files changed, 13 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ac5588a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java
b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java
index 89f025f..cfcf3b5 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProvider.java
@@ -149,7 +149,7 @@ public class TfsScmProvider
     {
         TfsChangeLogCommand command = new TfsChangeLogCommand();
         command.setLogger( getLogger() );
-        return (ChangeLogScmResult) command.execute( repository, fileSet, parameters );
+        return ( ChangeLogScmResult ) command.execute( repository, fileSet, parameters );
     }
 
     protected CheckOutScmResult checkout( ScmProviderRepository repository, ScmFileSet fileSet,
@@ -158,7 +158,7 @@ public class TfsScmProvider
     {
         TfsCheckOutCommand command = new TfsCheckOutCommand();
         command.setLogger( getLogger() );
-        return (CheckOutScmResult) command.execute( repository, fileSet, parameters );
+        return ( CheckOutScmResult ) command.execute( repository, fileSet, parameters );
     }
 
     protected EditScmResult edit( ScmProviderRepository repository, ScmFileSet fileSet, CommandParameters
parameters )

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ac5588a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java
b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java
index d367a92..d77358b 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/TfsScmProviderRepository.java
@@ -30,11 +30,11 @@ public class TfsScmProviderRepository
     private final String serverPath;
 
     private final String workspace;
-    
+
     private final boolean useCheckinPolicies;
 
     public TfsScmProviderRepository( String tfsUrl, String user, String password, String
serverPath, String workspace,
-    		boolean useCheckinPolicies)
+            boolean useCheckinPolicies )
     {
         super();
         setUser( user );
@@ -76,8 +76,8 @@ public class TfsScmProviderRepository
         return userPassword;
     }
 
-	public boolean isUseCheckinPolicies() 
-	{
-		return useCheckinPolicies;
-	}
+    public boolean isUseCheckinPolicies() 
+    {
+        return useCheckinPolicies;
+    }
 }

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ac5588a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckInCommand.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckInCommand.java
b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckInCommand.java
index 3fd8568..3b8ceab 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckInCommand.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsCheckInCommand.java
@@ -35,7 +35,6 @@ public class TfsCheckInCommand
     protected CheckInScmResult executeCheckInCommand( ScmProviderRepository r, ScmFileSet
f, String m, ScmVersion v )
         throws ScmException
     {
-
         TfsCommand command = createCommand( r, f, m );
         FileListConsumer fileConsumer = new FileListConsumer();
         ErrorStreamConsumer err = new ErrorStreamConsumer();
@@ -59,14 +58,14 @@ public class TfsCheckInCommand
         }
         command.addArgument( f );
         
-        TfsScmProviderRepository tfsScmProviderRepo = (TfsScmProviderRepository)r;
-        if(tfsScmProviderRepo.isUseCheckinPolicies())
+        TfsScmProviderRepository tfsScmProviderRepo = ( TfsScmProviderRepository )r;
+        if( tfsScmProviderRepo.isUseCheckinPolicies() )
         {
             //handle TFS-policies (by adding "/override:";Auto-Build: Version Update";)
             String policiesFix = "/override:checkin_policy";
-            command.addArgument( policiesFix + "");
+            command.addArgument( policiesFix + "" );
         }
-        
+
         return command;
     }
 

http://git-wip-us.apache.org/repos/asf/maven-scm/blob/8ac5588a/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
----------------------------------------------------------------------
diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
b/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
index 689c778..af00324 100644
--- a/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
+++ b/maven-scm-providers/maven-scm-provider-tfs/src/test/java/org/apache/maven/scm/provider/tfs/command/TfsCommandTest.java
@@ -33,7 +33,7 @@ public class TfsCommandTest
     protected TfsScmProviderRepository getScmProviderRepository()
     {
         return new TfsScmProviderRepository( "http://tfsurl", "user", "password", "serverpath",
"workspace",
-        		false);
+                false );
     }
 
     protected String getFileList()


Mime
View raw message