You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/11/21 21:49:07 UTC
svn commit: r882990 -
/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Author: bentmann
Date: Sat Nov 21 20:49:06 2009
New Revision: 882990
URL: http://svn.apache.org/viewvc?rev=882990&view=rev
Log:
o Optimized code
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=882990&r1=882989&r2=882990&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Sat Nov 21 20:49:06 2009
@@ -303,21 +303,22 @@
{
String name = (String) object;
String value = name;
+
+ String prefix = "";
+ String suffix = "";
+
+ Matcher m = classPattern.matcher( name );
+ if ( m.matches() )
+ {
+ prefix = m.group( 1 ) + "L";
+ suffix = ";";
+ name = m.group( 2 );
+ }
+
for ( Iterator i = relocators.iterator(); i.hasNext(); )
{
Relocator r = (Relocator) i.next();
- String prefix = "";
- String suffix = "";
-
- Matcher m = classPattern.matcher( name );
- if ( m.matches() )
- {
- prefix = m.group( 1 ) + "L";
- suffix = ";";
- name = m.group( 2 );
- }
-
if ( r.canRelocateClass( name ) )
{
value = prefix + r.relocateClass( name ) + suffix;
@@ -329,8 +330,10 @@
break;
}
}
+
return value;
}
+
return super.mapValue( object );
}