maven-m2-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdca...@apache.org
Subject cvs commit: maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance DefaultModelInheritanceAssembler.java
Date Wed, 02 Feb 2005 22:14:46 GMT
jdcasey     2005/02/02 14:14:46

  Modified:    maven-core/src/main/java/org/apache/maven/project
                        DefaultProjectDefaultsInjector.java
               maven-core/src/main/java/org/apache/maven/project/inheritance
                        DefaultModelInheritanceAssembler.java
  Log:
  o Fixed formats for inheritance assembler additions
  o Removed unused import on defaults injector.
  
  Revision  Changes    Path
  1.5       +0 -1      maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDefaultsInjector.java
  
  Index: DefaultProjectDefaultsInjector.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/DefaultProjectDefaultsInjector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultProjectDefaultsInjector.java	2 Feb 2005 22:13:15 -0000	1.4
  +++ DefaultProjectDefaultsInjector.java	2 Feb 2005 22:14:46 -0000	1.5
  @@ -9,7 +9,6 @@
   
   import org.apache.maven.model.Dependency;
   import org.apache.maven.model.DependencyManagement;
  -import org.codehaus.plexus.util.StringUtils;
   
   /**
    * @author jdcasey Created on Feb 1, 2005
  
  
  
  1.15      +18 -17    maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
  
  Index: DefaultModelInheritanceAssembler.java
  ===================================================================
  RCS file: /home/cvs/maven-components/maven-core/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- DefaultModelInheritanceAssembler.java	2 Feb 2005 03:11:02 -0000	1.14
  +++ DefaultModelInheritanceAssembler.java	2 Feb 2005 22:14:46 -0000	1.15
  @@ -140,14 +140,13 @@
                   child.setScm( childScm );
               }
   
  -            if ( StringUtils.isEmpty( childScm.getConnection() ) && 
  -                !StringUtils.isEmpty( parentScm.getConnection() ) )
  +            if ( StringUtils.isEmpty( childScm.getConnection() ) && !StringUtils.isEmpty(
parentScm.getConnection() ) )
               {
                   childScm.setConnection( parentScm.getConnection() + "/" + child.getArtifactId()
);
               }
   
  -            if ( StringUtils.isEmpty( childScm.getDeveloperConnection() ) &&
  -                !StringUtils.isEmpty( parentScm.getDeveloperConnection() ) )
  +            if ( StringUtils.isEmpty( childScm.getDeveloperConnection() )
  +                && !StringUtils.isEmpty( parentScm.getDeveloperConnection() ) )
               {
                   childScm.setDeveloperConnection( parentScm.getDeveloperConnection() + "/"
+ child.getArtifactId() );
               }
  @@ -326,38 +325,40 @@
                   child.addPlugin( plugin );
               }
           }
  -        
  +
           DependencyManagement parentDepMgmt = parent.getDependencyManagement();
  +
           DependencyManagement childDepMgmt = child.getDependencyManagement();
  -        if(parentDepMgmt != null)
  +
  +        if ( parentDepMgmt != null )
           {
  -            if(childDepMgmt == null)
  +            if ( childDepMgmt == null )
               {
  -                child.setDependencyManagement(parentDepMgmt);
  +                child.setDependencyManagement( parentDepMgmt );
               }
               else
               {
                   List parentDeps = parentDepMgmt.getDependencies();
  -                
  +
                   Map mappedParentDeps = new TreeMap();
                   for ( Iterator it = parentDeps.iterator(); it.hasNext(); )
                   {
                       Dependency dep = (Dependency) it.next();
  -                    mappedParentDeps.put(dep.getManagementKey(), dep);
  +                    mappedParentDeps.put( dep.getManagementKey(), dep );
                   }
  -                
  -                List deps = new ArrayList(parentDeps);
  +
  +                List deps = new ArrayList( parentDeps );
                   for ( Iterator it = childDepMgmt.getDependencies().iterator(); it.hasNext();
)
                   {
                       Dependency dep = (Dependency) it.next();
  -                    if(!mappedParentDeps.containsKey(dep.getManagementKey()))
  +                    if ( !mappedParentDeps.containsKey( dep.getManagementKey() ) )
                       {
  -                        deps.add(dep);
  +                        deps.add( dep );
                       }
                   }
  -                
  -                childDepMgmt.setDependencies(deps);
  +
  +                childDepMgmt.setDependencies( deps );
               }
           }
       }
  -}
  +}
  \ No newline at end of file
  
  
  

Mime
View raw message