You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/07/21 15:05:27 UTC

svn commit: r220058 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java

Author: brett
Date: Thu Jul 21 06:05:26 2005
New Revision: 220058

URL: http://svn.apache.org/viewcvs?rev=220058&view=rev
Log:
PR: MNG-567
fix off by one error

Modified:
    maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java

Modified: maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java?rev=220058&r1=220057&r2=220058&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java (original)
+++ maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java Thu Jul 21 06:05:26 2005
@@ -85,19 +85,19 @@
             return expression;
         }
 
-        if ( expression.equals( "localRepository" ) )
+        if ( "localRepository".equals( expression ) )
         {
             value = context.getLocalRepository();
         }
-        else if ( expression.equals( "session" ) )
+        else if ( "session".equals( expression ) )
         {
             value = context;
         }
-        else if ( expression.equals( "project" ) )
+        else if ( "project".equals( expression ) )
         {
             value = project;
         }
-        else if ( expression.equals( "executedProject" ) )
+        else if ( "executedProject".equals( expression ) )
         {
             value = project.getExecutionProject();
         }
@@ -109,7 +109,7 @@
 
                 if ( pathSeparator > 0 )
                 {
-                    String pathExpression = expression.substring( 1, pathSeparator );
+                    String pathExpression = expression.substring( 0, pathSeparator );
                     value = ReflectionValueExtractor.evaluate( pathExpression, project );
                     value = value + expression.substring( pathSeparator );
                 }
@@ -177,7 +177,7 @@
                                                          e );
             }
         }
-        else if ( expression.equals( "basedir" ) )
+        else if ( "basedir".equals( expression ) )
         {
             value = project.getBasedir().getAbsolutePath();
         }
@@ -250,7 +250,7 @@
 
     public File alignToBaseDirectory( File file )
     {
-        File basedir = null;
+        File basedir;
 
         if ( project != null && project.getFile() != null )
         {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org