svn commit: r1164912 - in /maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model: building/ModelBuildingEventCatapult.java interpolation/UrlNormalizingPostProcessor.java validation/DefaultModelValidator.java

[hboutemy]

Author: hboutemy
Date: Sat Sep  3 19:13:12 2011
New Revision: 1164912

URL: http://svn.apache.org/viewvc?rev=1164912&view=rev
Log:
fixed errors reported by Checkstyle

Modified:
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
    
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java?rev=1164912&r1=1164911&r2=1164912&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/building/ModelBuildingEventCatapult.java
 Sat Sep  3 19:13:12 2011
@@ -36,7 +36,7 @@ interface ModelBuildingEventCatapult
      */
     void fire( ModelBuildingListener listener, ModelBuildingEvent event );
 
-    final ModelBuildingEventCatapult BUILD_EXTENSIONS_ASSEMBLED = new 
ModelBuildingEventCatapult()
+    ModelBuildingEventCatapult BUILD_EXTENSIONS_ASSEMBLED = new 
ModelBuildingEventCatapult()
     {
         public void fire( ModelBuildingListener listener, ModelBuildingEvent 
event )
         {

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java?rev=1164912&r1=1164911&r2=1164912&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/interpolation/UrlNormalizingPostProcessor.java
 Sat Sep  3 19:13:12 2011
@@ -34,7 +34,7 @@ class UrlNormalizingPostProcessor
     implements InterpolationPostProcessor
 {
 
-    private static final Set<String> urlExpressions;
+    private static final Set<String> URL_EXPRESSIONS;
 
     static
     {
@@ -45,7 +45,7 @@ class UrlNormalizingPostProcessor
         expressions.add( "project.scm.developerConnection" );
         expressions.add( "project.distributionManagement.site.url" );
 
-        urlExpressions = expressions;
+        URL_EXPRESSIONS = expressions;
     }
 
     private UrlNormalizer normalizer;
@@ -57,7 +57,7 @@ class UrlNormalizingPostProcessor
 
     public Object execute( String expression, Object value )
     {
-        if ( value != null && urlExpressions.contains( expression ) )
+        if ( value != null && URL_EXPRESSIONS.contains( expression ) )
         {
             return normalizer.normalize( value.toString() );
         }

Modified: 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
URL: 
http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java?rev=1164912&r1=1164911&r2=1164912&view=diff
==============================================================================
--- 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 (original)
+++ 
maven/maven-3/trunk/maven-model-builder/src/main/java/org/apache/maven/model/validation/DefaultModelValidator.java
 Sat Sep  3 19:13:12 2011
@@ -869,7 +869,8 @@ public class DefaultModelValidator
                 int idx = fieldName.lastIndexOf( '.' );
                 if ( idx >= 0 )
                 {
-                    key = fieldName = fieldName.substring( idx + 1 );
+                    fieldName = fieldName.substring( idx + 1 );
+                    key = fieldName;
                 }
 
                 if ( fieldName.endsWith( "]" ) )