[Mulgara-svn] r617 - branches/mgr-61-sparql/src/jar/krule/java/org/mulgara/krule

[pag at mulgara.org]

Author: pag
Date: 2007-12-13 15:17:49 -0600 (Thu, 13 Dec 2007)
New Revision: 617

Modified:
   branches/mgr-61-sparql/src/jar/krule/java/org/mulgara/krule/Rule.java
   branches/mgr-61-sparql/src/jar/krule/java/org/mulgara/krule/RuleStructure.java
Log:
Cleaned up the template types

Modified: branches/mgr-61-sparql/src/jar/krule/java/org/mulgara/krule/Rule.java
===================================================================
--- branches/mgr-61-sparql/src/jar/krule/java/org/mulgara/krule/Rule.java	2007-12-13 21:12:57 UTC (rev 616)
+++ branches/mgr-61-sparql/src/jar/krule/java/org/mulgara/krule/Rule.java	2007-12-13 21:17:49 UTC (rev 617)
@@ -61,14 +61,11 @@
   private String name;
 
   /** The rules to be triggered when this rule generates statements.*/
-  private Set triggerSet;
+  private Set<Rule> triggerSet;
 
-  /** The query for this rule. */
+  /** The query for this rule. This contains the information for the base model. */
   private Query query;
 
-  /** The model containing the base data. */
-  private URI baseModel;
-  
   /** The model containing the inferred data. */
   private URI targetModel;
 
@@ -86,7 +83,7 @@
    * @param name The name of the rule.
    */
   public Rule(String name) {
-    triggerSet = new HashSet();
+    triggerSet = new HashSet<Rule>();
     this.name = name;
   }
 
@@ -112,16 +109,6 @@
 
 
   /**
-   * Set the base model for the rule.
-   *
-   * @param base The URI of the base data to apply rules to.
-   */
-  public void setBaseModel(URI base) {
-    baseModel = base;
-  }
-
-
-  /**
    * Set the target model for the rule.
    *
    * @param target The URI of the model to insert inferences into.
@@ -156,7 +143,7 @@
    *
    * @return an immutable set of the subordinate rules.
    */
-  public Set getTriggerTargets() {
+  public Set<Rule> getTriggerTargets() {
     return Collections.unmodifiableSet(triggerSet);
   }
 
@@ -213,11 +200,7 @@
    * Schedule subsequent rules.
    */
   private void scheduleTriggeredRules() {
-  	Iterator it = triggerSet.iterator();
-  	while (it.hasNext()) {
-  	  Rule rule = (Rule)it.next();
-  	  ruleStruct.schedule(rule);
-  	}
+  	for (Rule rule: triggerSet) ruleStruct.schedule(rule);
   }
 
 }

Modified: branches/mgr-61-sparql/src/jar/krule/java/org/mulgara/krule/RuleStructure.java
===================================================================
--- branches/mgr-61-sparql/src/jar/krule/java/org/mulgara/krule/RuleStructure.java	2007-12-13 21:12:57 UTC (rev 616)
+++ branches/mgr-61-sparql/src/jar/krule/java/org/mulgara/krule/RuleStructure.java	2007-12-13 21:17:49 UTC (rev 617)
@@ -187,7 +187,6 @@
    */
   public void setBaseModel(URI base) {
     baseModel = base;
-    for (Rule rule: rules) rule.setBaseModel(base);
   }
 
 
@@ -196,7 +195,7 @@
    *
    * @param base The URI of the base data to apply rules to.
    */
-  public URI setBaseModel() {
+  public URI getBaseModel() {
     return baseModel;
   }