[DL-Learner SVN] SF.net SVN: dl-learner: [304] trunk/src/dl-learner/org/dllearner/kb/sparql

[<jen...@us...>]

Revision: 304
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=304&view=rev
Author:   jenslehmann
Date:     2007-12-02 06:44:58 -0800 (Sun, 02 Dec 2007)

Log Message:
-----------
removed isXXX methods (can be checked using instanceof)

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/kb/sparql/ClassNode.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/Node.java
    trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/ClassNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/ClassNode.java	2007-12-02 14:41:38 UTC (rev 303)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/ClassNode.java	2007-12-02 14:44:58 UTC (rev 304)
@@ -40,11 +40,6 @@
 	}
 
 	@Override
-	public boolean isClass() {
-		return true;
-	}
-
-	@Override
 	public Set<String> toNTriple() {
 		Set<String> s = new HashSet<String>();
 		s.add("<" + this.uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java	2007-12-02 14:41:38 UTC (rev 303)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/ExtractionAlgorithm.java	2007-12-02 14:44:58 UTC (rev 304)
@@ -54,7 +54,7 @@
 		if (this.getAllBackground) {
 			Vector<Node> classes = new Vector<Node>();
 			for (Node one : v) {
-				if (one.isClass()) {
+				if (one instanceof ClassNode) {
 					classes.add(one);
 				}
 			}

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java	2007-12-02 14:41:38 UTC (rev 303)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/InstanceNode.java	2007-12-02 14:44:58 UTC (rev 304)
@@ -53,11 +53,6 @@
 	}
 
 	@Override
-	public boolean isInstance() {
-		return true;
-	}
-
-	@Override
 	public Set<String> toNTriple() {
 		Set<String> s = new HashSet<String>();
 		s.add("<" + uri + "><" + "http://www.w3.org/1999/02/22-rdf-syntax-ns#type" + "><"

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java	2007-12-02 14:41:38 UTC (rev 303)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Manipulator.java	2007-12-02 14:44:58 UTC (rev 304)
@@ -34,17 +34,17 @@
 		while (it.hasNext()) {
 			Tupel t = (Tupel) it.next();
 			// all classes with owl:type class
-			if (t.a.equals(type) && t.b.equals(classns) && node.isClass()) {
+			if (t.a.equals(type) && t.b.equals(classns) && node instanceof ClassNode) {
 				toRemove.add(t);
 			}
 			
 			// all with type class
-			if (t.b.equals(classns) && node.isClass()) {
+			if (t.b.equals(classns) && node instanceof ClassNode) {
 				toRemove.add(t);
 			}
 			
 			// all instances with owl:type thing
-			if (t.a.equals(type) && t.b.equals(thing) && node.isInstance()) {
+			if (t.a.equals(type) && t.b.equals(thing) && node instanceof InstanceNode) {
 				toRemove.add(t);
 			}
 			

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/Node.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/Node.java	2007-12-02 14:41:38 UTC (rev 303)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/Node.java	2007-12-02 14:44:58 UTC (rev 304)
@@ -35,18 +35,6 @@
 
 	}
 
-	public boolean isClass() {
-		return false;
-	}
-
-	public boolean isInstance() {
-		return false;
-	}
-
-	public boolean isProperty() {
-		return false;
-	}
-
 	public URI getURI() {
 		return uri;
 	}

Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java	2007-12-02 14:41:38 UTC (rev 303)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/PropertyNode.java	2007-12-02 14:44:58 UTC (rev 304)
@@ -48,11 +48,6 @@
 		return Nodes;
 	}
 
-	@Override
-	public boolean isProperty() {
-		return true;
-	}
-
 	public Node getB() {
 		return b;
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.