[jboss-svn-commits] JBL Code SVN: r18512 - in labs/jbossrules/branches/4.0.x: drools-core/src/main/java/org/drools/rule and 1 other directory.

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

Author: tirelli
Date: 2008-02-19 12:18:34 -0500 (Tue, 19 Feb 2008)
New Revision: 18512

Modified:
   labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java
   labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/Rule.java
Log:
JBRULES-1357: fixing minor issues with package name assignment and equals method implementation

Modified: labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java	2008-02-19 15:44:16 UTC (rev 18511)
+++ labs/jbossrules/branches/4.0.x/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java	2008-02-19 17:18:34 UTC (rev 18512)
@@ -114,6 +114,7 @@
         } else {
             this.rule = new Rule( ruleDescr.getName() );
         }
+        this.rule.setPackage( pkg.getName() );
 
         // Assign attributes
         setAttributes( this.rule,

Modified: labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/Rule.java
===================================================================
--- labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/Rule.java	2008-02-19 15:44:16 UTC (rev 18511)
+++ labs/jbossrules/branches/4.0.x/drools-core/src/main/java/org/drools/rule/Rule.java	2008-02-19 17:18:34 UTC (rev 18512)
@@ -230,6 +230,10 @@
         return this.pkg;
     }
 
+    public void setPackage( String pkg ) {
+        this.pkg = pkg;
+    }
+
     /**
      * Retrieve the name of this rule.
      * 
@@ -491,8 +495,7 @@
 
     public boolean equals(Object obj) {
         if ( this == obj ) return true;
-        if ( !super.equals( obj ) ) return false;
-        if ( getClass() != obj.getClass() ) return false;
+        if ( obj == null || getClass() != obj.getClass() ) return false;
         final Rule other = (Rule) obj;
         if ( name == null ) {
             if ( other.name != null ) return false;