dion        2002/07/14 08:40:49

  Modified:    src/java/org/apache/maven/app Maven.java
               src/java/org/apache/maven MavenUtils.java
                        ProjectVerifier.java MavenTool.java
  Log:
  Style violations
  
  Revision  Changes    Path
  1.63      +3 -2      jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java
  
  Index: Maven.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/app/Maven.java,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- Maven.java        14 Jul 2002 15:32:01 -0000      1.62
  +++ Maven.java        14 Jul 2002 15:40:48 -0000      1.63
  @@ -1480,7 +1480,8 @@
           {
               failed = true;
               System.err.println("INTERNAL ERROR");
  -            System.err.println("Reference made to goal '" + e.getGoalName() + "' 
which has no definition.");
  +            System.err.println("Reference made to goal '" + e.getGoalName() 
  +                + "' which has no definition.");
               System.out.println("");
               return;
           }
  @@ -1583,7 +1584,7 @@
               e.printStackTrace();
           }
   
  -        if (! failed)
  +        if (!failed)
           {
               System.out.println("BUILD SUCCESSFUL");
           }
  
  
  
  1.28      +5 -3      jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java
  
  Index: MavenUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenUtils.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- MavenUtils.java   3 Jul 2002 21:51:29 -0000       1.27
  +++ MavenUtils.java   14 Jul 2002 15:40:48 -0000      1.28
  @@ -107,7 +107,8 @@
           throws Exception
       {
           BeanReader beanReader = createBeanReader( Project.class );
  -        return (Project) beanReader.parse( new FileInputStream( projectDescriptor ) 
);
  +        return (Project) beanReader.parse(new FileInputStream(
  +            projectDescriptor));
       }
   
       /**
  @@ -186,7 +187,7 @@
           workspace.setProfile(profile);
           
           // Create our set of project.
  -        for (Iterator i = profile.getProjectIds().iterator(); i.hasNext();)
  +        for (Iterator i = profile.getProjectIds().iterator(); i.hasNext(); )
           {
               String projectId = (String) i.next();
               // This should take care of any trailing slashes, or the directory
  @@ -249,6 +250,7 @@
        * Creates a new instance of BeanReader 
        *
        * @param clazz the class to register with the reader
  +     * @return a {@link BeanReader bean reader}
        * @throws IntrospectionException when an error occurs trying to determine
        *      properties of the class provided
        */
  
  
  
  1.16      +7 -5      
jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java
  
  Index: ProjectVerifier.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/ProjectVerifier.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ProjectVerifier.java      11 Jul 2002 22:19:42 -0000      1.15
  +++ ProjectVerifier.java      14 Jul 2002 15:40:48 -0000      1.16
  @@ -259,12 +259,13 @@
           throws Exception
       {        
           for (Iterator i = getMavenProject().getDependencies().iterator();
  -             i.hasNext();)
  +             i.hasNext(); )
           {
               Dependency dependency = (Dependency) i.next();
               String jar = dependency.getJar();
           
  -            File jarFile = new File( 
getMavenLocalRepo()+"/"+dependency.getId()+"/jars/", jar);
  +            File jarFile = new File( getMavenLocalRepo() + "/" 
  +                + dependency.getId() + "/jars/", jar);
               
               if (jarFile.exists() == false || jar.endsWith("SNAPSHOT.jar"))
               {
  @@ -313,7 +314,7 @@
                   nonDistMap = getNonDistMap(f);
               }
               
  -            for (Iterator i = failedDependencies.iterator(); i.hasNext();)
  +            for (Iterator i = failedDependencies.iterator(); i.hasNext(); )
               {
                   String dependency = (String) i.next();
                   File destinationFile = new File(getMavenLocalRepo(),
  @@ -404,7 +405,8 @@
                   gotFile = HttpUtils.getFile(new URL(remoteRepo + remoteFile),
                                               localFile, remoteFile, verbose,
                                               ignoreErrors, useTimestamp, "", "",
  -                                            proxyHost, proxyPort, proxyUserName, 
proxyPassword);
  +                                            proxyHost, proxyPort, 
  +                                            proxyUserName, proxyPassword);
               }
               catch (MalformedURLException mue)
               {
  
  
  
  1.10      +1 -1      jakarta-turbine-maven/src/java/org/apache/maven/MavenTool.java
  
  Index: MavenTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/MavenTool.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- MavenTool.java    27 May 2002 12:19:51 -0000      1.9
  +++ MavenTool.java    14 Jul 2002 15:40:48 -0000      1.10
  @@ -200,7 +200,7 @@
       {
           List list = null;
           Object key = null;
  -        for (Iterator index = counted.keySet().iterator(); index.hasNext();)
  +        for (Iterator index = counted.keySet().iterator(); index.hasNext(); )
           {
               key = index.next();
               list = (List) counted.get(key);
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to