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

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

Author: Rikkola
Date: 2009-12-07 06:24:38 -0500 (Mon, 07 Dec 2009)
New Revision: 30505

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
Log:
GUVNOR-484 : Redundant imports when updating model jar

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	2009-12-07 11:14:33 UTC (rev 30504)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java	2009-12-07 11:24:38 UTC (rev 30505)
@@ -66,8 +66,13 @@
         while ( (entry = jis.getNextJarEntry()) != null ) {
             if ( !entry.isDirectory() ) {
                 if ( entry.getName().endsWith( ".class" ) && entry.getName().indexOf( '$' ) == -1 ) {
-                    buf.append( "import " + convertPathToName( entry.getName() ) );
-                    buf.append( "\n" );
+
+                    String line = "import " + convertPathToName( entry.getName() );
+                    // Add imports only once
+                    if ( !header.contains( line ) ) {
+                        buf.append( line );
+                        buf.append( "\n" );
+                    }
                 }
             }
         }