maven-scm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r687472 - in /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/diff/ repository/
Date Wed, 20 Aug 2008 21:33:41 GMT
Author: olamy
Date: Wed Aug 20 14:33:40 2008
New Revision: 687472

URL: http://svn.apache.org/viewvc?rev=687472&view=rev
Log:
fix checkstyle issues

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/AbstractGitScmProvider.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/GitChangeSet.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/GitCommandUtils.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/diff/GitDiffConsumer.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/repository/GitScmProviderRepository.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/AbstractGitScmProvider.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/AbstractGitScmProvider.java?rev=687472&r1=687471&r2=687472&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/AbstractGitScmProvider.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/AbstractGitScmProvider.java
Wed Aug 20 14:33:40 2008
@@ -62,11 +62,14 @@
     //
     // ----------------------------------------------------------------------
 
+    /**
+     * Internal class
+     */
     private static class ScmUrlParserResult
     {
-        List messages = new ArrayList();
+        private List messages = new ArrayList();
 
-        ScmProviderRepository repository;
+        private ScmProviderRepository repository;
     }
 
     // ----------------------------------------------------------------------

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/GitChangeSet.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/GitChangeSet.java?rev=687472&r1=687471&r2=687472&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/GitChangeSet.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/GitChangeSet.java
Wed Aug 20 14:33:40 2008
@@ -41,12 +41,25 @@
         super();
     }
 
-    public GitChangeSet( String strDate, String userDatePattern, String comment, String author,
List/*<ChangeFile>*/ files )
+    /**
+     * @param strDate
+     * @param userDatePattern
+     * @param comment
+     * @param author
+     * @param files List of {@link ChangeFile}
+     */
+    public GitChangeSet( String strDate, String userDatePattern, String comment, String author,
List files )
     {
         super( strDate, userDatePattern, comment, author, files );
     }
 
-    public GitChangeSet( Date date, String comment, String author, List/*<ChangeFile>*/
files )
+    /**
+     * @param date
+     * @param comment
+     * @param author
+     * @param files List of {@link ChangeFile}
+     */
+    public GitChangeSet( Date date, String comment, String author, List files )
     {
         super( date, comment, author, files );
     }

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/GitCommandUtils.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/GitCommandUtils.java?rev=687472&r1=687471&r2=687472&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/GitCommandUtils.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/GitCommandUtils.java
Wed Aug 20 14:33:40 2008
@@ -54,7 +54,7 @@
 
         cl.setWorkingDirectory( fileSet.getBasedir().getAbsolutePath() );
 
-        if ( settings.getTraceGitCommand() != null)
+        if ( settings.getTraceGitCommand() != null )
         {
             cl.addEnvironment( "GIT_TRACE", settings.getTraceGitCommand() );
         }

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/diff/GitDiffConsumer.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/diff/GitDiffConsumer.java?rev=687472&r1=687471&r2=687472&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/diff/GitDiffConsumer.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/diff/GitDiffConsumer.java
Wed Aug 20 14:33:40 2008
@@ -108,8 +108,8 @@
         catch ( RESyntaxException ex )
         {
             throw new RuntimeException(
-                "INTERNAL ERROR: Could not create regexp to parse git log file. This shouldn't
happen. Something is probably wrong with the oro installation.",
-                ex );
+                                        "INTERNAL ERROR: Could not create regexp to parse
git log file. Something is probably wrong with the oro installation.",
+                                        ex );
         }
 
     }
@@ -121,10 +121,10 @@
     /** {@inheritDoc} */
     public void consumeLine( String line )
     {
-        if ( filesRegexp.match(line) )
+        if ( filesRegexp.match( line ) )
         {
             // start a new file
-            currentFile = filesRegexp.getParen(1);
+            currentFile = filesRegexp.getParen( 1 );
 
             changedFiles.add( new ScmFile( currentFile, ScmFileStatus.MODIFIED ) );
 
@@ -148,8 +148,7 @@
             // skip, though could parse to verify start revision and end revision
             patch.append( line ).append( "\n" );
         }
-        else if ( line.startsWith( NEW_FILE_MODE_TOKEN ) ||
-                  line.startsWith( DELETED_FILE_MODE_TOKEN ))
+        else if ( line.startsWith( NEW_FILE_MODE_TOKEN ) || line.startsWith( DELETED_FILE_MODE_TOKEN
) )
         {
             // skip, though could parse to verify file mode
             patch.append( line ).append( "\n" );
@@ -164,9 +163,9 @@
             // skip, though could parse to verify filename, end revision
             patch.append( line ).append( "\n" );
         }
-        else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN
) ||
-            line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN
) ||
-            line.equals( NO_NEWLINE_TOKEN ) )
+        else if ( line.startsWith( ADDED_LINE_TOKEN ) || line.startsWith( REMOVED_LINE_TOKEN
)
+            || line.startsWith( UNCHANGED_LINE_TOKEN ) || line.startsWith( CHANGE_SEPARATOR_TOKEN
)
+            || line.equals( NO_NEWLINE_TOKEN ) )
         {
             // add to buffer
             currentDifference.append( line ).append( "\n" );

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/repository/GitScmProviderRepository.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/repository/GitScmProviderRepository.java?rev=687472&r1=687471&r2=687472&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/repository/GitScmProviderRepository.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/repository/GitScmProviderRepository.java
Wed Aug 20 14:33:40 2008
@@ -123,7 +123,8 @@
 
         String urlPath = url.substring( getProtocol().length() );
 
-        if ( urlPath.startsWith( "://" ) ) {
+        if ( urlPath.startsWith( "://" ) )
+        {
             urlPath = urlPath.substring( 3 );
         }
         int indexAt = urlPath.indexOf( "@" );



Mime
View raw message