[jboss-svn-commits] JBL Code SVN: r32579 - labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler.

[jboss-svn-commits at lists.jboss.org]

Author: baunax
Date: 2010-04-15 12:08:10 -0400 (Thu, 15 Apr 2010)
New Revision: 32579

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
Log:
GUVNOR-529 When importing a jar with two classes one being a prefix of the other the shorten isn't imported at all.
- fixed it

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java	2010-04-15 12:49:08 UTC (rev 32578)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java	2010-04-15 16:08:10 UTC (rev 32579)
@@ -22,6 +22,7 @@
 import java.util.Set;
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
+import java.util.regex.Pattern;
 
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.guvnor.server.ServiceImplementation;
@@ -61,16 +62,15 @@
         Set<String> imports = getImportsFromJar( asset.getBinaryContentAttachment() );
 
         for ( String importLine : imports ) {
-            if ( header.indexOf( importLine ) == -1 ) {
-                header.append( importLine ).append( "\n" );
-            }
+        	Pattern pattern = Pattern.compile("\\b" + importLine.replace(".", "\\.") + "\\b");
+        	if (!pattern.matcher(header).find()) {
+        		header.append( importLine ).append( "\n" );
+        	}
         }
 
-        ServiceImplementation.updateDroolsHeader( header.toString(),
-                                                  pkg );
+		ServiceImplementation.updateDroolsHeader(header.toString(), pkg);
+		pkg.checkin("Imports setup automatically on model import.");
 
-        pkg.checkin( "Imports setup automatically on model import." );
-
     }
 
     public void onAttachmentRemoved(AssetItem item) throws IOException {