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

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

Author: Rikkola
Date: 2010-01-13 11:33:16 -0500 (Wed, 13 Jan 2010)
New Revision: 31067

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/GuvnorDroolsDocsBuilder.java
Log:
Fixed broken Guvnor

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/GuvnorDroolsDocsBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/GuvnorDroolsDocsBuilder.java	2010-01-13 15:14:36 UTC (rev 31066)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/files/GuvnorDroolsDocsBuilder.java	2010-01-13 16:33:16 UTC (rev 31067)
@@ -7,8 +7,8 @@
 import java.util.List;
 
 import org.drools.compiler.DroolsParserException;
-import org.drools.doc.DrlPackageData;
-import org.drools.doc.DrlRuleData;
+import org.drools.verifier.misc.DrlPackageParser;
+import org.drools.verifier.misc.DrlRuleParser;
 import org.drools.doc.DroolsDocsBuilder;
 import org.drools.guvnor.client.common.AssetFormats;
 import org.drools.guvnor.server.ServiceImplementation;
@@ -39,9 +39,9 @@
         super( createDrlPackageData( packageItem ) );
     }
 
-    protected static DrlPackageData createDrlPackageData(PackageItem packageItem) {
+    protected static DrlPackageParser createDrlPackageData(PackageItem packageItem) {
 
-        List<DrlRuleData> rules = new ArrayList<DrlRuleData>();
+        List<DrlRuleParser> rules = new ArrayList<DrlRuleParser>();
 
         // Get And Fill Rule Data
         Iterator<AssetItem> assets = packageItem.getAssets();
@@ -51,7 +51,7 @@
             if ( formats.contains( assetItem.getFormat() ) && !assetItem.getDisabled() && !assetItem.isArchived() ) {
                 String drl = getDRL( assetItem );
                 if ( drl != null ) {
-                    DrlRuleData ruleData = DrlRuleData.findRulesDataFromDrl( drl ).get( 0 );
+                    DrlRuleParser ruleData = DrlRuleParser.findRulesDataFromDrl( drl ).get( 0 );
 
                     // Add info about categories
                     List<String> categories = new ArrayList<String>();
@@ -59,9 +59,9 @@
                         categories.add( ci.getName() );
                     }
 
-                    ruleData.otherInformation.put( "Categories",
+                    ruleData.getOtherInformation().put( "Categories",
                                                    categories );
-                    ruleData.metadata.addAll( createMetaData( assetItem ) );
+                    ruleData.getMetadata().addAll( createMetaData( assetItem ) );
 
                     rules.add( ruleData );
                 }
@@ -69,10 +69,10 @@
         }
 
         String header = ServiceImplementation.getDroolsHeader( packageItem );
-        List<String> globals = DrlPackageData.findGlobals( header );
+        List<String> globals = DrlPackageParser.findGlobals( header );
 
         // Get And Fill Package Data
-        return new DrlPackageData( packageItem.getName(),
+        return new DrlPackageParser( packageItem.getName(),
                                    packageItem.getDescription(),
                                    rules,
                                    globals,