[jboss-svn-commits] JBL Code SVN: r21306 - in labs/jbossrules/trunk/drools-decisiontables/src: main/java/org/drools/decisiontable/parser and 1 other directories.

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

Author: michael.neale at jboss.com
Date: 2008-07-31 01:33:14 -0400 (Thu, 31 Jul 2008)
New Revision: 21306

Modified:
   labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/decisiontable/SpreadsheetCompiler.java
   labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java
   labs/jbossrules/trunk/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
Log:
allow imports in DT

Modified: labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/decisiontable/SpreadsheetCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/decisiontable/SpreadsheetCompiler.java	2008-07-31 05:25:36 UTC (rev 21305)
+++ labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/decisiontable/SpreadsheetCompiler.java	2008-07-31 05:33:14 UTC (rev 21306)
@@ -41,19 +41,19 @@
     /**
      * Generates DRL from the input stream containing the spreadsheet.
      *
-     * @param showPackageAndImports
-     *            tells it to print or not print any package/import/global statements in the spreadsheet.
+     * @param showPackage
+     *            tells it to print or not print any package statements in the spreadsheet.
      * @param xlsStream
      *            The stream to the spreadsheet. Uses the first worksheet found
      *            for the decision tables, ignores others.
      * @return DRL xml, ready for use in drools.
      */
-    public String compile(boolean showPackageAndImports,
+    public String compile(boolean showPackage,
                           final InputStream xlsStream,
                           final InputType type) {
         return compile( xlsStream,
                         type,
-                        new DefaultRuleSheetListener( showPackageAndImports ) );
+                        new DefaultRuleSheetListener( showPackage ) );
     }
 
     /**

Modified: labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java	2008-07-31 05:25:36 UTC (rev 21305)
+++ labs/jbossrules/trunk/drools-decisiontables/src/main/java/org/drools/decisiontable/parser/DefaultRuleSheetListener.java	2008-07-31 05:33:14 UTC (rev 21306)
@@ -138,7 +138,6 @@
         for ( Rule rule : this._ruleList ) {
             ruleset.addRule( rule );
         }
-        if (showPackage) {
 	        final List<Import> importList = RuleSheetParserUtil.getImportList( getProperties().getProperty( IMPORT_TAG ) );
 	        for ( Import import1 : importList ) {
 	            ruleset.addImport( import1 );
@@ -149,7 +148,6 @@
 	        for ( Global global : variableList ) {
 	            ruleset.addVariable( global );
 	        }
-        }
 
         final String functions = getProperties().getProperty( FUNCTIONS_TAG );
         ruleset.addFunctions( functions );

Modified: labs/jbossrules/trunk/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java
===================================================================
--- labs/jbossrules/trunk/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java	2008-07-31 05:25:36 UTC (rev 21305)
+++ labs/jbossrules/trunk/drools-decisiontables/src/test/java/org/drools/decisiontable/SpreadsheetCompilerUnitTest.java	2008-07-31 05:33:14 UTC (rev 21306)
@@ -44,7 +44,7 @@
         assertTrue( drl.indexOf( "rule \"How cool am I_12\"" ) > drl.indexOf( "rule \"How cool am I_11\"" ) );
         assertTrue( drl.indexOf( "import example.model.User;" ) > -1 );
         assertTrue( drl.indexOf( "import example.model.Car;" ) > -1 );
-
+        assertTrue( drl.indexOf("package ") > -1);
         InputStream ins = this.getClass().getResourceAsStream("/data/MultiSheetDST.xls");
 
         drl = converter.compile( false, ins,
@@ -53,8 +53,8 @@
         assertNotNull( drl );
 
         assertTrue( drl.indexOf( "rule \"How cool am I_12\"" ) > 0 );
-        assertTrue( drl.indexOf( "import example.model.User;" ) == -1 );
-        assertTrue( drl.indexOf( "import example.model.Car;" ) == -1 );
+        assertTrue( drl.indexOf( "import example.model.User;" ) > -1 );
+        assertTrue( drl.indexOf( "import example.model.Car;" ) > -1 );
         assertTrue( drl.indexOf("package ") == -1);
 
     }