You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by co...@apache.org on 2011/03/25 14:56:55 UTC
svn commit: r1085368 - in /incubator/stanbol/trunk/kres/rules/base: ./
src/main/java/org/apache/stanbol/rules/base/api/
src/main/java/org/apache/stanbol/rules/base/api/util/
Author: concelvio
Date: Fri Mar 25 13:56:54 2011
New Revision: 1085368
URL: http://svn.apache.org/viewvc?rev=1085368&view=rev
Log:
STANBOL-39:
- changed parent version in pom.xml to ${stanbol-version}
- removed kres-version from pom.xml
- changed name KReSRule.java to Rule.java
- changed name KReSRuleAtom.java to RuleAtom.java
- changed name KReSRuleExpressiveness.java to RuleExpressiveness.java
- changed name KReSRuleManager.java to RuleManager.java
- changed name KReSRuleIterator.java to RuleIterator.java
- changed KReSRuleList.java to RuleList.java
Added:
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRule.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleAtom.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleAtom.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleExpressiveness.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleExpressiveness.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleManager.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleManager.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleIterator.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleIterator.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleList.java
Removed:
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRule.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleAtom.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleExpressiveness.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleManager.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleIterator.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleList.java
Modified:
incubator/stanbol/trunk/kres/rules/base/pom.xml
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java
Modified: incubator/stanbol/trunk/kres/rules/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/pom.xml?rev=1085368&r1=1085367&r2=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/pom.xml (original)
+++ incubator/stanbol/trunk/kres/rules/base/pom.xml Fri Mar 25 13:56:54 2011
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../../parent</relativePath>
</parent>
@@ -39,10 +39,6 @@
<inceptionYear>2010</inceptionYear>
- <properties>
- <kres-version>0.7</kres-version>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -79,7 +75,6 @@
<dependencies>
- <!-- KReS deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.owlapi</artifactId>
Modified: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java?rev=1085368&r1=1085367&r2=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java Fri Mar 25 13:56:54 2011
@@ -5,7 +5,7 @@ import java.util.Collection;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
-import org.apache.stanbol.rules.base.api.util.KReSRuleList;
+import org.apache.stanbol.rules.base.api.util.RuleList;
import org.semanticweb.owlapi.model.IRI;
import com.hp.hpl.jena.rdf.model.Model;
@@ -15,12 +15,12 @@ public interface Recipe {
/**
* Get the rule of the recipe identified by the ruleURI. The rule is returned as
- * a {@link KReSRule} object.
+ * a {@link Rule} object.
*
* @param ruleURI
- * @return the object that represents a {@link KReSRule}
+ * @return the object that represents a {@link Rule}
*/
- public KReSRule getRule(String ruleURI);
+ public Rule getRule(String ruleURI);
/**
* Trasnform the rules contained in the recipe in a set of SPARQL CONSTRUCT queries.
@@ -37,17 +37,17 @@ public interface Recipe {
public Model getRecipeAsRDFModel();
/**
- * Serialize the rules contained in the recipe to KReSRule Syntax.
+ * Serialize the rules contained in the recipe to Rule Syntax.
* @return the {@link String} containing the serialization of the recipe's rules
- * in KReSRule Syntax.
+ * in Rule Syntax.
*/
public String getRulesInKReSSyntax();
/**
- * Get the list of the {@link KReSRule} contained in the recipe.
- * @return the {@link KReSRuleList}.
+ * Get the list of the {@link Rule} contained in the recipe.
+ * @return the {@link RuleList}.
*/
- public KReSRuleList getkReSRuleList();
+ public RuleList getkReSRuleList();
/**
* Get the ID of the recipe in the {@link RuleStore}.
@@ -62,10 +62,10 @@ public interface Recipe {
public String getRecipeDescription();
/**
- * Add a KReSRule to the recipe.
+ * Add a Rule to the recipe.
* This operation does not effect a change on recipe in the rule store, but only in the in-memory
* representation of a specific recipe. To permanently change the recipe use {@link RuleStore#addRuleToRecipe(IRI, String)}.
- * @param kReSRule the {@link KReSRule}.
+ * @param kReSRule the {@link Rule}.
*/
- public void addKReSRule(KReSRule kReSRule);
+ public void addKReSRule(Rule kReSRule);
}
Copied: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java (from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRule.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java?p2=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java&p1=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRule.java&r1=1085259&r2=1085368&rev=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRule.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java Fri Mar 25 13:56:54 2011
@@ -10,13 +10,13 @@ import com.hp.hpl.jena.rdf.model.Resourc
/**
- * A KReSRule is a Java object that represent a rule in KReS. It contains methods to transform a rule both in SWRL and in KReSRule
+ * A Rule is a Java object that represent a rule in KReS. It contains methods to transform a rule both in SWRL and in Rule
* syntax.
*
* @author andrea.nuzzolese
*
*/
-public interface KReSRule {
+public interface Rule {
/**
* Gets the name of the rule.
@@ -33,28 +33,28 @@ public interface KReSRule {
public void setRuleName(String ruleName);
/**
- * Returns the representation of the rule in KReSRule syntax.
+ * Returns the representation of the rule in Rule syntax.
*
- * @return the {@link String} of the rule in KReSRule syntax.
+ * @return the {@link String} of the rule in Rule syntax.
*/
public String getRule();
/**
- * Sets the rule expressed in KReSRule syntax
+ * Sets the rule expressed in Rule syntax
*
* @param rule {@link String}
*/
public void setRule(String rule);
/**
- * Maps a {@code KReSRule} to a Jena {@link Resource} object in a given Jena {@link Model}.
+ * Maps a {@code Rule} to a Jena {@link Resource} object in a given Jena {@link Model}.
* @param model {@link Model}
* @return the {@link Resource} containing the rule.
*/
public Resource toSWRL(Model model);
/**
- * Maps a {@code KReSRule} to an OWL-API {@link SWRLRule}.
+ * Maps a {@code Rule} to an OWL-API {@link SWRLRule}.
* @param factory {@link OWLDataFactory}
* @return the {@link SWRLRule} containing the rule.
*/
@@ -84,7 +84,7 @@ public interface KReSRule {
/**
* Retunr the KReS syntax representation of the rule.
- * @return the string of the rule in KReSRule syntax.
+ * @return the string of the rule in Rule syntax.
*/
public String toKReSSyntax();
@@ -102,6 +102,6 @@ public interface KReSRule {
public boolean isReflexive();
- public KReSRuleExpressiveness getExpressiveness();
+ public RuleExpressiveness getExpressiveness();
}
Copied: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleAtom.java (from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleAtom.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleAtom.java?p2=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleAtom.java&p1=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleAtom.java&r1=1085259&r2=1085368&rev=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleAtom.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleAtom.java Fri Mar 25 13:56:54 2011
@@ -6,7 +6,7 @@ import org.semanticweb.owlapi.model.SWRL
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-public interface KReSRuleAtom {
+public interface RuleAtom {
public Resource toSWRL(Model model);
public SPARQLObject toSPARQL();
Copied: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleExpressiveness.java (from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleExpressiveness.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleExpressiveness.java?p2=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleExpressiveness.java&p1=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleExpressiveness.java&r1=1085259&r2=1085368&rev=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleExpressiveness.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleExpressiveness.java Fri Mar 25 13:56:54 2011
@@ -1,6 +1,6 @@
package org.apache.stanbol.rules.base.api;
-public enum KReSRuleExpressiveness {
+public enum RuleExpressiveness {
KReSCore, KReSBuiltIn, ForwardChaining, Reflexive, SPARQLConstruct, SPARQLDelete, SPARQLDeleteData
}
Copied: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleManager.java (from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleManager.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleManager.java?p2=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleManager.java&p1=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleManager.java&r1=1085259&r2=1085368&rev=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/KReSRuleManager.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleManager.java Fri Mar 25 13:56:54 2011
@@ -10,10 +10,10 @@ import org.semanticweb.owlapi.model.IRI;
* @author andrea.nuzzolese
*
*/
-public interface KReSRuleManager {
+public interface RuleManager {
/**
- * Adds one or more rules to the rule ontology of KReS. Rules are passed as {@link String} contantining rules in KReSRule format
+ * Adds one or more rules to the rule ontology of KReS. Rules are passed as {@link String} contantining rules in Rule format
* @param kReSRuleString {@link String}
* @return true if the rule is added, false otherwise.
*/
@@ -66,8 +66,8 @@ public interface KReSRuleManager {
* Gets the selected rule from the rule base.
*
* @param ruleIRI {@link IRI}
- * @return the {@link KReSRule}.
+ * @return the {@link Rule}.
*/
- public KReSRule getRule(IRI ruleIRI);
+ public Rule getRule(IRI ruleIRI);
}
Modified: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java?rev=1085368&r1=1085367&r2=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java Fri Mar 25 13:56:54 2011
@@ -38,6 +38,6 @@ public interface RuleStore {
public boolean removeRecipe(IRI recipeIRI);
- public boolean removeRule(KReSRule rule);
+ public boolean removeRule(Rule rule);
}
Modified: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java?rev=1085368&r1=1085367&r2=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java Fri Mar 25 13:56:54 2011
@@ -2,19 +2,19 @@ package org.apache.stanbol.rules.base.ap
import java.util.Iterator;
-import org.apache.stanbol.rules.base.api.KReSRule;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.Rule;
+import org.apache.stanbol.rules.base.api.RuleAtom;
-public class AtomIterator implements Iterator<KReSRuleAtom>{
+public class AtomIterator implements Iterator<RuleAtom>{
private int currentIndex;
private int listSize;
- private KReSRuleAtom[] kReSRuleAtoms;
+ private RuleAtom[] kReSRuleAtoms;
public AtomIterator(AtomList atomList) {
this.listSize = atomList.size();
- this.kReSRuleAtoms = new KReSRuleAtom[listSize];
+ this.kReSRuleAtoms = new RuleAtom[listSize];
this.kReSRuleAtoms = atomList.toArray(this.kReSRuleAtoms);
this.currentIndex = 0;
}
@@ -28,8 +28,8 @@ public class AtomIterator implements Ite
}
}
- public KReSRuleAtom next() {
- KReSRuleAtom atom = kReSRuleAtoms[currentIndex];
+ public RuleAtom next() {
+ RuleAtom atom = kReSRuleAtoms[currentIndex];
currentIndex++;
return atom;
}
Modified: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java?rev=1085368&r1=1085367&r2=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomList.java Fri Mar 25 13:56:54 2011
@@ -4,25 +4,25 @@ package org.apache.stanbol.rules.base.ap
import java.util.Collection;
import java.util.Iterator;
-import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.RuleAtom;
import org.apache.stanbol.rules.base.api.util.AtomIterator;
-public class AtomList implements Collection<KReSRuleAtom> {
+public class AtomList implements Collection<RuleAtom> {
- private KReSRuleAtom[] kReSRuleAtoms;
+ private RuleAtom[] kReSRuleAtoms;
public AtomList() {
}
- public boolean add(KReSRuleAtom kReSRuleAtom) {
+ public boolean add(RuleAtom kReSRuleAtom) {
if(kReSRuleAtoms == null){
- kReSRuleAtoms = new KReSRuleAtom[1];
+ kReSRuleAtoms = new RuleAtom[1];
kReSRuleAtoms[0] = kReSRuleAtom;
}
else{
- KReSRuleAtom[] semionRulesCopy = new KReSRuleAtom[kReSRuleAtoms.length+1];
+ RuleAtom[] semionRulesCopy = new RuleAtom[kReSRuleAtoms.length+1];
System.arraycopy(kReSRuleAtoms, 0, semionRulesCopy, 0, kReSRuleAtoms.length);
semionRulesCopy[semionRulesCopy.length-1] = kReSRuleAtom;
kReSRuleAtoms = semionRulesCopy;
@@ -30,13 +30,13 @@ public class AtomList implements Collect
return true;
}
- public boolean addToHead(KReSRuleAtom kReSRuleAtom) {
+ public boolean addToHead(RuleAtom kReSRuleAtom) {
if(kReSRuleAtoms == null){
- kReSRuleAtoms = new KReSRuleAtom[1];
+ kReSRuleAtoms = new RuleAtom[1];
kReSRuleAtoms[0] = kReSRuleAtom;
}
else{
- KReSRuleAtom[] semionRulesCopy = new KReSRuleAtom[kReSRuleAtoms.length+1];
+ RuleAtom[] semionRulesCopy = new RuleAtom[kReSRuleAtoms.length+1];
System.arraycopy(kReSRuleAtoms, 0, semionRulesCopy, 1, kReSRuleAtoms.length);
semionRulesCopy[0] = kReSRuleAtom;
kReSRuleAtoms = semionRulesCopy;
@@ -44,16 +44,16 @@ public class AtomList implements Collect
return true;
}
- public boolean addAll(Collection<? extends KReSRuleAtom> c) {
+ public boolean addAll(Collection<? extends RuleAtom> c) {
- KReSRuleAtom[] collectionOfSemionRules = new KReSRuleAtom[c.size()];
+ RuleAtom[] collectionOfSemionRules = new RuleAtom[c.size()];
collectionOfSemionRules = c.toArray(collectionOfSemionRules);
if(kReSRuleAtoms == null){
kReSRuleAtoms = collectionOfSemionRules;
}
else{
- KReSRuleAtom[] semionRulesCopy = new KReSRuleAtom[kReSRuleAtoms.length+collectionOfSemionRules.length];
+ RuleAtom[] semionRulesCopy = new RuleAtom[kReSRuleAtoms.length+collectionOfSemionRules.length];
System.arraycopy(kReSRuleAtoms, 0, semionRulesCopy, 0, kReSRuleAtoms.length);
System.arraycopy(collectionOfSemionRules, 0, semionRulesCopy, kReSRuleAtoms.length, collectionOfSemionRules.length);
kReSRuleAtoms = semionRulesCopy;
@@ -67,7 +67,7 @@ public class AtomList implements Collect
}
public boolean contains(Object o) {
- for(KReSRuleAtom semionRule : kReSRuleAtoms){
+ for(RuleAtom semionRule : kReSRuleAtoms){
if(semionRule.equals(o)){
return true;
}
@@ -78,7 +78,7 @@ public class AtomList implements Collect
public boolean containsAll(Collection<?> c) {
for(Object o : c){
- for(KReSRuleAtom semionRule : kReSRuleAtoms){
+ for(RuleAtom semionRule : kReSRuleAtoms){
if(!semionRule.equals(o)){
return false;
}
@@ -99,16 +99,16 @@ public class AtomList implements Collect
}
}
- public Iterator<KReSRuleAtom> iterator() {
+ public Iterator<RuleAtom> iterator() {
return new AtomIterator(this);
}
public boolean remove(Object o) {
boolean removed = false;
for(int i=0; i<kReSRuleAtoms.length && !removed; i++){
- KReSRuleAtom semionRule = kReSRuleAtoms[i];
+ RuleAtom semionRule = kReSRuleAtoms[i];
if(semionRule.equals(o)){
- KReSRuleAtom[] semionRulesCopy = new KReSRuleAtom[kReSRuleAtoms.length-1];
+ RuleAtom[] semionRulesCopy = new RuleAtom[kReSRuleAtoms.length-1];
System.arraycopy(kReSRuleAtoms, 0, semionRulesCopy, 0, i);
System.arraycopy(kReSRuleAtoms, i+1, semionRulesCopy, 0, semionRulesCopy.length-i);
kReSRuleAtoms = semionRulesCopy;
@@ -123,9 +123,9 @@ public class AtomList implements Collect
for(Object o : c){
boolean removed = false;
for(int i=0; i<kReSRuleAtoms.length && !removed; i++){
- KReSRuleAtom semionRule = kReSRuleAtoms[i];
+ RuleAtom semionRule = kReSRuleAtoms[i];
if(semionRule.equals(o)){
- KReSRuleAtom[] semionRulesCopy = new KReSRuleAtom[kReSRuleAtoms.length-1];
+ RuleAtom[] semionRulesCopy = new RuleAtom[kReSRuleAtoms.length-1];
System.arraycopy(kReSRuleAtoms, 0, semionRulesCopy, 0, i);
System.arraycopy(kReSRuleAtoms, i+1, semionRulesCopy, 0, semionRulesCopy.length-i);
kReSRuleAtoms = semionRulesCopy;
@@ -141,19 +141,19 @@ public class AtomList implements Collect
}
public boolean retainAll(Collection<?> c) {
- KReSRuleAtom[] semionRulesCopy = null;
- KReSRuleAtom[] semionRulesTMP = null;
+ RuleAtom[] semionRulesCopy = null;
+ RuleAtom[] semionRulesTMP = null;
for(Object o : c){
- if(o instanceof KReSRuleAtom){
+ if(o instanceof RuleAtom){
if(contains(o)){
if(semionRulesCopy == null){
- semionRulesCopy = new KReSRuleAtom[1];
- semionRulesCopy[0] = (KReSRuleAtom) o;
+ semionRulesCopy = new RuleAtom[1];
+ semionRulesCopy[0] = (RuleAtom) o;
}
else{
- semionRulesTMP = new KReSRuleAtom[semionRulesCopy.length+1];
+ semionRulesTMP = new RuleAtom[semionRulesCopy.length+1];
System.arraycopy(semionRulesCopy, 0, semionRulesTMP, 0, semionRulesCopy.length);
- semionRulesTMP[semionRulesTMP.length-1] = (KReSRuleAtom) o;
+ semionRulesTMP[semionRulesTMP.length-1] = (RuleAtom) o;
semionRulesCopy = semionRulesTMP;
}
}
Copied: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleIterator.java (from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleIterator.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleIterator.java?p2=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleIterator.java&p1=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleIterator.java&r1=1085259&r2=1085368&rev=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleIterator.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleIterator.java Fri Mar 25 13:56:54 2011
@@ -2,18 +2,18 @@ package org.apache.stanbol.rules.base.ap
import java.util.Iterator;
-import org.apache.stanbol.rules.base.api.KReSRule;
+import org.apache.stanbol.rules.base.api.Rule;
-public class KReSRuleIterator implements Iterator<KReSRule> {
+public class RuleIterator implements Iterator<Rule> {
private int currentIndex;
private int listSize;
- private KReSRule[] semionRules;
+ private Rule[] semionRules;
- public KReSRuleIterator(KReSRuleList semionRuleList) {
+ public RuleIterator(RuleList semionRuleList) {
this.listSize = semionRuleList.size();
- this.semionRules = new KReSRule[listSize];
+ this.semionRules = new Rule[listSize];
this.semionRules = semionRuleList.toArray(this.semionRules);
this.currentIndex = 0;
@@ -28,8 +28,8 @@ public class KReSRuleIterator implements
}
}
- public KReSRule next() {
- KReSRule semionRule = semionRules[currentIndex];
+ public Rule next() {
+ Rule semionRule = semionRules[currentIndex];
currentIndex++;
return semionRule;
}
Copied: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java (from r1085259, incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleList.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java?p2=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java&p1=incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleList.java&r1=1085259&r2=1085368&rev=1085368&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/KReSRuleList.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java Fri Mar 25 13:56:54 2011
@@ -4,29 +4,29 @@ package org.apache.stanbol.rules.base.ap
import java.util.Collection;
import java.util.Iterator;
-import org.apache.stanbol.rules.base.api.KReSRule;
-import org.apache.stanbol.rules.base.api.util.KReSRuleIterator;
+import org.apache.stanbol.rules.base.api.Rule;
+import org.apache.stanbol.rules.base.api.util.RuleIterator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class KReSRuleList implements Collection<KReSRule> {
+public class RuleList implements Collection<Rule> {
private final Logger log = LoggerFactory.getLogger(getClass());
- private KReSRule[] kReSRules;
+ private Rule[] kReSRules;
- public KReSRuleList() {
+ public RuleList() {
}
- public boolean add(KReSRule semionRule) {
+ public boolean add(Rule semionRule) {
if (kReSRules == null) {
- kReSRules = new KReSRule[1];
+ kReSRules = new Rule[1];
kReSRules[0] = semionRule;
} else {
- KReSRule[] semionRulesCopy = new KReSRule[kReSRules.length + 1];
+ Rule[] semionRulesCopy = new Rule[kReSRules.length + 1];
System
.arraycopy(kReSRules, 0, semionRulesCopy, 0,
kReSRules.length);
@@ -38,12 +38,12 @@ public class KReSRuleList implements Col
return true;
}
- public boolean addToHead(KReSRule semionRule) {
+ public boolean addToHead(Rule semionRule) {
if (kReSRules == null) {
- kReSRules = new KReSRule[1];
+ kReSRules = new Rule[1];
kReSRules[0] = semionRule;
} else {
- KReSRule[] semionRulesCopy = new KReSRule[kReSRules.length + 1];
+ Rule[] semionRulesCopy = new Rule[kReSRules.length + 1];
System
.arraycopy(kReSRules, 0, semionRulesCopy, 1,
kReSRules.length);
@@ -55,15 +55,15 @@ public class KReSRuleList implements Col
return true;
}
- public boolean addAll(Collection<? extends KReSRule> c) {
+ public boolean addAll(Collection<? extends Rule> c) {
- KReSRule[] collectionOfSemionRules = new KReSRule[c.size()];
+ Rule[] collectionOfSemionRules = new Rule[c.size()];
collectionOfSemionRules = c.toArray(collectionOfSemionRules);
if (kReSRules == null) {
kReSRules = collectionOfSemionRules;
} else {
- KReSRule[] semionRulesCopy = new KReSRule[kReSRules.length
+ Rule[] semionRulesCopy = new Rule[kReSRules.length
+ collectionOfSemionRules.length];
System
.arraycopy(kReSRules, 0, semionRulesCopy, 0,
@@ -85,7 +85,7 @@ public class KReSRuleList implements Col
}
public boolean contains(Object o) {
- for (KReSRule semionRule : kReSRules) {
+ for (Rule semionRule : kReSRules) {
if (semionRule.equals(o)) {
return true;
}
@@ -96,7 +96,7 @@ public class KReSRuleList implements Col
public boolean containsAll(Collection<?> c) {
for (Object o : c) {
- for (KReSRule semionRule : kReSRules) {
+ for (Rule semionRule : kReSRules) {
if (!semionRule.equals(o)) {
return false;
} else {
@@ -116,16 +116,16 @@ public class KReSRuleList implements Col
}
}
- public Iterator<KReSRule> iterator() {
- return new KReSRuleIterator(this);
+ public Iterator<Rule> iterator() {
+ return new RuleIterator(this);
}
public boolean remove(Object o) {
boolean removed = false;
for (int i = 0; i < kReSRules.length && !removed; i++) {
- KReSRule semionRule = kReSRules[i];
+ Rule semionRule = kReSRules[i];
if (semionRule.equals(o)) {
- KReSRule[] semionRulesCopy = new KReSRule[kReSRules.length - 1];
+ Rule[] semionRulesCopy = new Rule[kReSRules.length - 1];
System.arraycopy(kReSRules, 0, semionRulesCopy, 0, i);
System.arraycopy(kReSRules, i + 1, semionRulesCopy, 0,
semionRulesCopy.length - i);
@@ -141,9 +141,9 @@ public class KReSRuleList implements Col
for (Object o : c) {
boolean removed = false;
for (int i = 0; i < kReSRules.length && !removed; i++) {
- KReSRule semionRule = kReSRules[i];
+ Rule semionRule = kReSRules[i];
if (semionRule.equals(o)) {
- KReSRule[] semionRulesCopy = new KReSRule[kReSRules.length - 1];
+ Rule[] semionRulesCopy = new Rule[kReSRules.length - 1];
System.arraycopy(kReSRules, 0, semionRulesCopy, 0, i);
System.arraycopy(kReSRules, i + 1, semionRulesCopy, 0,
semionRulesCopy.length - i);
@@ -159,19 +159,19 @@ public class KReSRuleList implements Col
}
public boolean retainAll(Collection<?> c) {
- KReSRule[] semionRulesCopy = null;
- KReSRule[] semionRulesTMP = null;
+ Rule[] semionRulesCopy = null;
+ Rule[] semionRulesTMP = null;
for (Object o : c) {
- if (o instanceof KReSRule) {
+ if (o instanceof Rule) {
if (contains(o)) {
if (semionRulesCopy == null) {
- semionRulesCopy = new KReSRule[1];
- semionRulesCopy[0] = (KReSRule) o;
+ semionRulesCopy = new Rule[1];
+ semionRulesCopy[0] = (Rule) o;
} else {
- semionRulesTMP = new KReSRule[semionRulesCopy.length + 1];
+ semionRulesTMP = new Rule[semionRulesCopy.length + 1];
System.arraycopy(semionRulesCopy, 0, semionRulesTMP, 0,
semionRulesCopy.length);
- semionRulesTMP[semionRulesTMP.length - 1] = (KReSRule) o;
+ semionRulesTMP[semionRulesTMP.length - 1] = (Rule) o;
semionRulesCopy = semionRulesTMP;
}
}