svn commit: r769953 - in /maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model: Processor.java interpolator/DefaultInterpolator.java processors/BaseProcessor.java

[sisbell]

Author: sisbell
Date: Wed Apr 29 21:46:24 2009
New Revision: 769953

URL: http://svn.apache.org/viewvc?rev=769953&view=rev
Log:
Cleanup of unused methods.

Modified:
    
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
    
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
    
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java

Modified: 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java?rev=769953&r1=769952&r2=769953&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/Processor.java
 Wed Apr 29 21:46:24 2009
@@ -26,10 +26,6 @@
 public interface Processor
 {
     void process( Object parent, Object child, Object target, boolean 
isChildMostSpecialized );
-
-    Object getParent();
-
-    Object getChild();
     
     List<Model> getParentModels();
 

Modified: 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java?rev=769953&r1=769952&r2=769953&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/interpolator/DefaultInterpolator.java
 Wed Apr 29 21:46:24 2009
@@ -48,7 +48,7 @@
         
         if(properties == null)
         {
-               return model;
+               properties = new Properties();
         }
         
         List<InterpolatorProperty>  interpolatorProperties = new 
ArrayList<InterpolatorProperty>();

Modified: 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java?rev=769953&r1=769952&r2=769953&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-model-builder/src/main/java/org/apache/maven/model/processors/BaseProcessor.java
 Wed Apr 29 21:46:24 2009
@@ -35,10 +35,6 @@
 public abstract class BaseProcessor implements Processor
 {
 
-    Object parent;
-
-    Object child;
-
     Collection<Processor> processors;
     
     private List<Model> parentModels;
@@ -75,8 +71,6 @@
             throw new IllegalArgumentException( "target: null" );
         }
 
-        this.parent = parent;
-        this.child = child;
         if(parent instanceof Model)
         {
                parentModels.add( (Model) parent );
@@ -85,19 +79,8 @@
         {
             processor.process( parent, child, target, isChildMostSpecialized );
         }
-
-    }
-
-    public Object getChild()
-    {
-        return child;
     }
-
-    public Object getParent()
-    {
-        return parent;
-    }
-    
+  
     protected String normalizeUriWithRelativePath(String u, String artifactId, 
Model parent)
     {
        if(u == null)