[jboss-svn-commits] JBL Code SVN: r32032 - in labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src: test/java/org/drools/guvnor/server/util and 1 other directory.

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

Author: ryanzhang
Date: 2010-03-11 05:59:14 -0500 (Thu, 11 Mar 2010)
New Revision: 32032

Modified:
   labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
   labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
Log:
BRMS-228, Merge fix from trunk, Merge actions:1) svn merge -r 26591:29536 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java 2) Merge FileManageUtilsTest.java partially because it involves other jira.

Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java	2010-03-11 10:33:25 UTC (rev 32031)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java	2010-03-11 10:59:14 UTC (rev 32032)
@@ -34,51 +34,57 @@
  */
 public class ModelContentHandler extends ContentHandler {
 
-	public void retrieveAssetContent(RuleAsset asset, PackageItem pkg,
-			AssetItem item) throws SerializableException {
-		// do nothing, as we have an attachment
-	}
+    public void retrieveAssetContent(RuleAsset asset,
+                                     PackageItem pkg,
+                                     AssetItem item) throws SerializableException {
+        // do nothing, as we have an attachment
+    }
 
-	public void storeAssetContent(RuleAsset asset, AssetItem repoAsset)
-			throws SerializableException {
-		// do nothing, as we have an attachment
-	}
+    public void storeAssetContent(RuleAsset asset,
+                                  AssetItem repoAsset) throws SerializableException {
+        // do nothing, as we have an attachment
+    }
 
-	/**
-	 * This is called when a model jar is attached, it will peer into it, and then automatically add imports
-	 * if there aren't any already in the package header configuration.
-	 */
-	public void modelAttached(AssetItem asset) throws IOException {
-		InputStream in = asset.getBinaryContentAttachment();
+    /**
+     * This is called when a model jar is attached, it will peer into it, and then automatically add imports
+     * if there aren't any already in the package header configuration.
+     */
+    public void modelAttached(AssetItem asset) throws IOException {
+        InputStream in = asset.getBinaryContentAttachment();
 
-		PackageItem pkg = asset.getPackage();
-		String header = ServiceImplementation.getDroolsHeader(pkg);
-		if ( header == null || "".equals(header.trim())) {
-			StringBuilder buf = new StringBuilder();
+        PackageItem pkg = asset.getPackage();
+        String header = ServiceImplementation.getDroolsHeader( pkg );
+        StringBuilder buf = new StringBuilder();
 
-			JarInputStream jis = new JarInputStream(in);
-			JarEntry entry = null;
-			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");
-					}
-				}
-			}
+        if ( header != null ) {
+            buf.append( header );
+            buf.append( '\n' );
+        }
 
-			ServiceImplementation.updateDroolsHeader(buf.toString(), pkg);
+        JarInputStream jis = new JarInputStream( in );
+        JarEntry entry = null;
+        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" );
+                }
+            }
+        }
 
-			//pkg.updateHeader(buf.toString());
+        ServiceImplementation.updateDroolsHeader( buf.toString(),
+                                                  pkg );
 
-			pkg.checkin("Imports setup automatically on model import.");
+        //pkg.updateHeader(buf.toString());
 
-		}
-	}
+        pkg.checkin( "Imports setup automatically on model import." );
 
+    }
 
-	public static String convertPathToName(String name) {
-		return name.replace(".class", "").replace("/", ".");
-	}
+    public static String convertPathToName(String name) {
+        return name.replace( ".class",
+                             "" ).replace( "/",
+                                           "." );
+    }
 
 }
\ No newline at end of file

Modified: labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java	2010-03-11 10:33:25 UTC (rev 32031)
+++ labs/jbossrules/soa_branches/BRMS-5.0.1/drools-guvnor/src/test/java/org/drools/guvnor/server/util/FileManagerUtilsTest.java	2010-03-11 10:59:14 UTC (rev 32032)
@@ -104,7 +104,7 @@
 
 		fm.attachFileToAsset(asset.getUUID(), this.getClass().getResourceAsStream("/billasurf.jar"), "billasurf.jar");
 		pkg = repo.loadPackage("testAttachModelImports");
-		assertEquals("goo wee", ServiceImplementation.getDroolsHeader(pkg));
+		assertEquals("goo wee\nimport com.billasurf.Person\nimport com.billasurf.Board\n", ServiceImplementation.getDroolsHeader(pkg));
 
 	}
 
@@ -457,4 +457,4 @@
 
 	}
 
-}
\ No newline at end of file
+}