[DL-Learner SVN] SF.net SVN: dl-learner: [390] trunk/src/dl-learner/org/dllearner/server

[<ku...@us...>]

Revision: 390
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=390&view=rev
Author:   kurzum
Date:     2008-01-18 02:52:00 -0800 (Fri, 18 Jan 2008)

Log Message:
-----------
bugfix

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/server/ClientState.java
    trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java

Modified: trunk/src/dl-learner/org/dllearner/server/ClientState.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/ClientState.java	2008-01-18 10:48:33 UTC (rev 389)
+++ trunk/src/dl-learner/org/dllearner/server/ClientState.java	2008-01-18 10:52:00 UTC (rev 390)
@@ -33,7 +33,7 @@
 import org.dllearner.core.ReasonerComponent;
 import org.dllearner.core.ReasoningService;
 import org.dllearner.kb.OWLFile;
-import org.dllearner.kb.sparql.SparqlEndpoint;
+import org.dllearner.kb.SparqlKnowledgeSource;
 
 /**
  * Stores the state of a DL-Learner client session.
@@ -113,7 +113,7 @@
 		while(it.hasNext()) {
 			KnowledgeSource source = it.next();
 			if((source instanceof OWLFile && ((OWLFile)source).getURL().toString().equals(url))
-				|| (source instanceof SparqlEndpoint && ((SparqlEndpoint)source).getURL().toString().equals(url)) ) {
+				|| (source instanceof SparqlKnowledgeSource && ((SparqlKnowledgeSource)source).getURL().toString().equals(url)) ) {
 				it.remove();
 				return true;
 			}

Modified: trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-01-18 10:48:33 UTC (rev 389)
+++ trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java	2008-01-18 10:52:00 UTC (rev 390)
@@ -46,7 +46,7 @@
 import org.dllearner.core.dl.Concept;
 import org.dllearner.core.dl.Individual;
 import org.dllearner.kb.OWLFile;
-import org.dllearner.kb.sparql.SparqlEndpoint;
+import org.dllearner.kb.SparqlKnowledgeSource;
 import org.dllearner.learningproblems.PosNegDefinitionLP;
 import org.dllearner.learningproblems.PosNegInclusionLP;
 import org.dllearner.learningproblems.PosOnlyDefinitionLP;
@@ -79,7 +79,7 @@
 	
 	public DLLearnerWS() {
 		knowledgeSourceMapping.put("owlfile", OWLFile.class);
-		knowledgeSourceMapping.put("sparql", SparqlEndpoint.class);
+		knowledgeSourceMapping.put("sparql", SparqlKnowledgeSource.class);
 		reasonerMapping.put("dig", DIGReasoner.class);
 		learningProblemMapping.put("posNegDefinition", PosNegDefinitionLP.class);
 		learningProblemMapping.put("posNegInclusion", PosNegInclusionLP.class);
@@ -500,10 +500,10 @@
 			thread = new Thread() {
 				@Override
 				public void run() {
-					((SparqlEndpoint)component).setSubjectThread(this);
-					((SparqlEndpoint)component).setSubjectThreadRunning(true);
-					((SparqlEndpoint)component).calculateSubjects(label,limit);
-					((SparqlEndpoint)component).setSubjectThreadRunning(false);
+					((SparqlKnowledgeSource)component).setSubjectThread(this);
+					((SparqlKnowledgeSource)component).setSubjectThreadRunning(true);
+					((SparqlKnowledgeSource)component).calculateSubjects(label,limit);
+					((SparqlKnowledgeSource)component).setSubjectThreadRunning(false);
 				}
 			};
 		} else if (method.equals("triples")){
@@ -511,10 +511,10 @@
 			thread = new Thread() {
 				@Override
 				public void run() {
-					((SparqlEndpoint)component).setTriplesThread(this);
-					((SparqlEndpoint)component).setTriplesThreadRunning(true);
-					((SparqlEndpoint)component).calculateTriples(subject);
-					((SparqlEndpoint)component).setTriplesThreadRunning(false);
+					((SparqlKnowledgeSource)component).setTriplesThread(this);
+					((SparqlKnowledgeSource)component).setTriplesThreadRunning(true);
+					((SparqlKnowledgeSource)component).calculateTriples(subject);
+					((SparqlKnowledgeSource)component).setTriplesThreadRunning(false);
 				}
 			};
 		} else if (method.equals("conceptSubjects")){
@@ -522,10 +522,10 @@
 			thread = new Thread() {
 				@Override
 				public void run() {
-					((SparqlEndpoint)component).setConceptThread(this);
-					((SparqlEndpoint)component).setConceptThreadRunning(true);
-					((SparqlEndpoint)component).calculateConceptSubjects(concept);
-					((SparqlEndpoint)component).setConceptThreadRunning(false);
+					((SparqlKnowledgeSource)component).setConceptThread(this);
+					((SparqlKnowledgeSource)component).setConceptThreadRunning(true);
+					((SparqlKnowledgeSource)component).calculateConceptSubjects(concept);
+					((SparqlKnowledgeSource)component).setConceptThreadRunning(false);
 				}
 			};
 		}
@@ -538,11 +538,11 @@
 		ClientState state = getState(id);
 		Component component = state.getComponent(componentID);
 		if (option.equals("subjects"))
-			return ((SparqlEndpoint)component).subjectThreadIsRunning();
+			return ((SparqlKnowledgeSource)component).subjectThreadIsRunning();
 		else if (option.equals("triples"))
-			return ((SparqlEndpoint)component).triplesThreadIsRunning();
+			return ((SparqlKnowledgeSource)component).triplesThreadIsRunning();
 		else if (option.equals("conceptSubjects"))
-			return ((SparqlEndpoint)component).conceptThreadIsRunning();
+			return ((SparqlKnowledgeSource)component).conceptThreadIsRunning();
 		return true;
 	}
 	
@@ -552,11 +552,11 @@
 		ClientState state = getState(id);
 		Component component = state.getComponent(componentID);
 		if (option.equals("subjects"))
-			((SparqlEndpoint)component).getSubjectThread().stop();
+			((SparqlKnowledgeSource)component).getSubjectThread().stop();
 		else if (option.equals("triples"))
-			((SparqlEndpoint)component).getTriplesThread().stop();
+			((SparqlKnowledgeSource)component).getTriplesThread().stop();
 		else if (option.equals("conceptSubjects"))
-			((SparqlEndpoint)component).getConceptThread().stop();
+			((SparqlKnowledgeSource)component).getConceptThread().stop();
 	}
 	
 	@WebMethod
@@ -565,11 +565,11 @@
 		ClientState state = getState(id);
 		Component component = state.getComponent(componentID);
 		if (option.equals("subjects"))
-			return ((SparqlEndpoint)component).getSubjects();
+			return ((SparqlKnowledgeSource)component).getSubjects();
 		else if (option.equals("triples"))
-			return ((SparqlEndpoint)component).getTriples();
+			return ((SparqlKnowledgeSource)component).getTriples();
 		else if (option.equals("conceptSubjects"))
-			return ((SparqlEndpoint)component).getConceptSubjects();
+			return ((SparqlKnowledgeSource)component).getConceptSubjects();
 		return new String[0];
 	}
 	


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