[jboss-cvs] jboss-seam/src/main/org/jboss/seam/drools ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/06/22 21:18:21

  Modified:    src/main/org/jboss/seam/drools  RuleBase.java
  Log:
  simplified, and PackageBuilder picks up validation errors that DrlParser doesn't
  
  Revision  Changes    Path
  1.11      +6 -10     jboss-seam/src/main/org/jboss/seam/drools/RuleBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RuleBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/drools/RuleBase.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- RuleBase.java	22 Jun 2007 23:32:59 -0000	1.10
  +++ RuleBase.java	23 Jun 2007 01:18:21 -0000	1.11
  @@ -6,11 +6,9 @@
   import java.util.List;
   
   import org.drools.RuleBaseFactory;
  -import org.drools.compiler.DrlParser;
   import org.drools.compiler.PackageBuilder;
   import org.drools.compiler.PackageBuilderConfiguration;
   import org.drools.compiler.ParserError;
  -import org.drools.lang.descr.PackageDescr;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Scope;
  @@ -55,27 +53,25 @@
               }
               // read in the source
               Reader drlReader = new InputStreamReader(stream);
  -            PackageDescr packageDescr;
  -            DrlParser drlParser = new DrlParser();
  +                                  
               if (dslFile==null)
               {
  -               packageDescr = drlParser.parse(drlReader);
  +               builder.addPackageFromDrl(drlReader);               
               }
               else
               {
                  Reader dslReader = new InputStreamReader( ResourceLoader.instance().getResourceAsStream(dslFile) );
  -               packageDescr = drlParser.parse(drlReader, dslReader);
  +               builder.addPackageFromDrl(drlReader, dslReader);
               }
  -            if ( drlParser.hasErrors() )
  +            
  +            if ( builder.hasErrors() )
               {
                  log.error("errors parsing rules in: " + ruleFile);
  -               for ( ParserError error: (List<ParserError>) drlParser.getErrors() )
  +               for ( ParserError error: (List<ParserError>) builder.getErrors() )
                  {
                     log.error( error.getMessage() + " (" + ruleFile + ':' + error.getRow() + ')' );
                  }
               }
  -            // pre build the package
  -            builder.addPackage(packageDescr);
            }
         }