Author: aheritier Date: Fri Jul 21 14:53:54 2006 New Revision: 424466 URL: http://svn.apache.org/viewvc?rev=424466&view=rev Log: Always place constants on the left side of equals()
Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java?rev=424466&r1=424465&r2=424466&view=diff ============================================================================== --- maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java (original) +++ maven/maven-1/core/trunk/src/java/org/apache/maven/plugin/PluginScriptParser.java Fri Jul 21 14:53:54 2006 @@ -76,7 +76,7 @@ */ public void startPrefixMapping( String prefix, String uri ) { - if ( !"".equals( prefix ) && !uri.startsWith( "jelly:" ) && !uri.startsWith( "dummy" ) && !uri.equals( "" ) ) + if ( !"".equals( prefix ) && !uri.startsWith( "jelly:" ) && !uri.startsWith( "dummy" ) && !"".equals( uri ) ) { dynaTagLibDecls.add( uri ); handler.addPluginDynaTagDep( jellyScriptHousing, uri ); @@ -93,7 +93,7 @@ */ public void startElement( String uri, String localName, String rawName, Attributes attributes ) { - if ( uri.equals( "jelly:core" ) && localName.equals( "import" ) ) + if ( "jelly:core".equals( uri ) && "import".equals( localName ) ) { String importUri = attributes.getValue( "uri" ); if ( importUri == null ) @@ -178,7 +178,7 @@ { // Use lazy version } - else if ( "taglib".equals( localName ) && uri.equals( "jelly:define" ) ) + else if ( "taglib".equals( localName ) && "jelly:define".equals( uri ) ) { String tagLibUri = attributes.getValue( "uri" ); Modified: maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java URL: http://svn.apache.org/viewvc/maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java?rev=424466&r1=424465&r2=424466&view=diff ============================================================================== --- maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java (original) +++ maven/maven-1/core/trunk/src/java/org/apache/maven/werkz/Goal.java Fri Jul 21 14:53:54 2006 @@ -239,7 +239,7 @@ */ public void addPreGoalCallback( PreGoalCallback callback ) { - if ( this.preGoalCallbacks.equals( Collections.EMPTY_LIST ) ) + if ( Collections.EMPTY_LIST.equals( this.preGoalCallbacks ) ) { this.preGoalCallbacks = new ArrayList( 3 ); }