Qualité de code

git-svn-id: https://svn/svn/cxxplugin/trunk/cxx-maven-plugin@191 8590dc0d-de66-4e26-86b1-74403aa5d994
Neticoa · Mar 23, 2016 · dd66d01 · dd66d01
1 parent 0258654
commit dd66d01
Show file tree

Hide file tree

Showing 15 changed files with 23 additions and 27 deletions.
diff --git a/src/main/java/org/codehaus/mojo/AbstractLaunchMojo.java b/src/main/java/org/codehaus/mojo/AbstractLaunchMojo.java
@@ -174,7 +174,7 @@ private void ensureExistWorkingDirectory() throws MojoExecutionException
     //@Parameter( defaultValue = "${session}", readonly = true )
     //protected MavenSession session;
 
-    protected abstract List getSuccesCode();
+    protected abstract List<String> getSuccesCode();
 
     protected boolean isResultCodeAFailure( int result )
     {

diff --git a/src/main/java/org/codehaus/mojo/CMakeMojo.java b/src/main/java/org/codehaus/mojo/CMakeMojo.java
@@ -165,7 +165,7 @@ protected Map getMoreEnvironmentVariables()
     }
 
     @Override
-    protected List getSuccesCode()
+    protected List<String> getSuccesCode()
     {
         return null;
     }

diff --git a/src/main/java/org/codehaus/mojo/CppCheckMojo.java b/src/main/java/org/codehaus/mojo/CppCheckMojo.java
@@ -227,7 +227,7 @@ protected Map getMoreEnvironmentVariables()
     }
 
     @Override
-    protected List getSuccesCode()
+    protected List<String> getSuccesCode()
     {
         return null;
     }

diff --git a/src/main/java/org/codehaus/mojo/CppNcssMojo.java b/src/main/java/org/codehaus/mojo/CppNcssMojo.java
@@ -178,7 +178,7 @@ protected Map getMoreEnvironmentVariables()
     }
 
     @Override
-    protected List getSuccesCode()
+    protected List<String> getSuccesCode()
     {
         return null;
     }

diff --git a/src/main/java/org/codehaus/mojo/LaunchMojo.java b/src/main/java/org/codehaus/mojo/LaunchMojo.java
@@ -106,10 +106,10 @@ protected Map getMoreEnvironmentVariables()
      * @since 0.0.4
      */
     @Parameter()
-    private List successCodes;
+    private List<String> successCodes;
 
     @Override
-    protected List getSuccesCode()
+    protected List<String> getSuccesCode()
     {
         return successCodes;
     }

diff --git a/src/main/java/org/codehaus/mojo/MakeMojo.java b/src/main/java/org/codehaus/mojo/MakeMojo.java
@@ -102,7 +102,7 @@ protected Map getMoreEnvironmentVariables()
     }
 
     @Override
-    protected List getSuccesCode()
+    protected List<String> getSuccesCode()
     {
         return null;
     }

diff --git a/src/main/java/org/codehaus/mojo/QMakeMojo.java b/src/main/java/org/codehaus/mojo/QMakeMojo.java
@@ -51,7 +51,7 @@ protected List<String> getArgsList()
      * @since 0.0.4
      */
     @Parameter()
-    private List sourceDirs = new ArrayList();
+    private List<String> sourceDirs = new ArrayList<String>();
 
     /**
      * qmake project file list
@@ -61,9 +61,9 @@ protected List<String> getArgsList()
      * @since 0.0.5
      */
     @Parameter()
-    private List pros = new ArrayList();
+    private List<String> pros = new ArrayList<String>();
 
-    protected List getProjectList()
+    protected List<String> getProjectList()
     {
         if ( pros.size() == 0 )
         {
@@ -96,7 +96,7 @@ protected String getCommandArgs()
         {
             result += commandArgs + " ";
         }
-        List proList = getProjectList();
+        List<String> proList = getProjectList();
         Iterator it = proList.iterator();
         while ( it.hasNext() )
         {
@@ -152,7 +152,7 @@ protected Map getMoreEnvironmentVariables()
     }
 
     @Override
-    protected List getSuccesCode()
+    protected List<String> getSuccesCode()
     {
         return null;
     }

diff --git a/src/main/java/org/codehaus/mojo/ScmDependenciesMojo.java b/src/main/java/org/codehaus/mojo/ScmDependenciesMojo.java
@@ -115,14 +115,6 @@ public class ScmDependenciesMojo
     @Parameter( property = "basedir", readonly = true, required = true )
     protected File basedir;
 
-   /**
-    * Current Project
-    * 
-    * @since 0.0.6
-    */
-    @Parameter( property = "project" )
-    protected org.apache.maven.project.MavenProject project;
-
     /**
      * Optional source dependencies sub-directory holder
      * 

diff --git a/src/main/java/org/codehaus/mojo/ValgrindMojo.java b/src/main/java/org/codehaus/mojo/ValgrindMojo.java
@@ -126,7 +126,7 @@ protected Map getMoreEnvironmentVariables()
     }
 
     @Override
-    protected List getSuccesCode()
+    protected List<String> getSuccesCode()
     {
         return null;
     }

diff --git a/src/main/java/org/codehaus/mojo/VeraxxMojo.java b/src/main/java/org/codehaus/mojo/VeraxxMojo.java
@@ -388,7 +388,7 @@ protected Map getMoreEnvironmentVariables()
     }
 
     @Override
-    protected List getSuccesCode()
+    protected List<String> getSuccesCode()
     {
         return null;
     }

diff --git a/src/main/java/org/codehaus/mojo/VisualStudioMojo.java b/src/main/java/org/codehaus/mojo/VisualStudioMojo.java
@@ -227,7 +227,7 @@ protected Map getMoreEnvironmentVariables()
     }
 
     @Override
-    protected List getSuccesCode()
+    protected List<String> getSuccesCode()
     {
         return null;
     }

diff --git a/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiveContentLister.java b/src/main/java/org/codehaus/plexus/archiver/tar/TarArchiveContentLister.java
@@ -201,18 +201,18 @@ protected void execute( File sourceFile, File destDirectory )
      * @return input stream with on-the-fly decompression
      * @throws IOException thrown by GZIPInputStream constructor
      */
-    private InputStream decompress( UntarCompressionMethod compression, final File file, final InputStream istream )
+    private InputStream decompress( UntarCompressionMethod aiCompression, final File file, final InputStream istream )
         throws IOException, ArchiverException
     {
-        if ( compression == UntarCompressionMethod.GZIP )
+        if ( aiCompression == UntarCompressionMethod.GZIP )
         {
             return new GZIPInputStream( istream );
         }
-        else if ( compression == UntarCompressionMethod.BZIP2 )
+        else if ( aiCompression == UntarCompressionMethod.BZIP2 )
         {
             return new BZip2CompressorInputStream( istream );
         }
-        else if ( compression == UntarCompressionMethod.SNAPPY )
+        else if ( aiCompression == UntarCompressionMethod.SNAPPY )
         {
             // SNAPPY
             //return new SnappyInputStream( istream );

diff --git a/src/test/java/org/apache/maven/plugin/AutomateTest.java b/src/test/java/org/apache/maven/plugin/AutomateTest.java
@@ -19,6 +19,7 @@
  */
 
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+
 import org.codehaus.utils.Automate;
 import org.codehaus.utils.AutomateException;
 import org.codehaus.utils.Action;

diff --git a/src/test/java/org/apache/maven/plugin/GenerateMojoTest.java b/src/test/java/org/apache/maven/plugin/GenerateMojoTest.java
@@ -19,6 +19,8 @@
  */
 
 import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import java.io.File;
+
 import org.codehaus.mojo.GenerateMojo;
 
 public class GenerateMojoTest

diff --git a/src/test/java/org/apache/maven/plugin/SvnExternalsTokenizerTest.java b/src/test/java/org/apache/maven/plugin/SvnExternalsTokenizerTest.java
@@ -44,6 +44,7 @@ protected void tearDown()
     /**
      * @throws Exception if any
      */
+
     public void test1() throws Exception
     {
         String s = "-r455 source target ";