[DL-Learner SVN] SF.net SVN: dl-learner:[1225] trunk/src/dl-learner/org/dllearner/tools/ protege

[<hee...@us...>]

Revision: 1225
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1225&view=rev
Author:   heeroyuy
Date:     2008-09-17 08:59:58 +0000 (Wed, 17 Sep 2008)

Log Message:
-----------
some warnings fixed

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
    trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java
    trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
    trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java	2008-09-17 08:15:45 UTC (rev 1224)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java	2008-09-17 08:59:58 UTC (rev 1225)
@@ -253,8 +253,7 @@
 				eDescription = i.next();
 				if (desc.equals(eDescription.getDescription()
 						.toManchesterSyntaxString(
-								editorKit.getOWLModelManager()
-										.getActiveOntology().getURI()
+								editorKit.getModelManager().getActiveOntology().getURI()
 										+ "#", null))) {
 					evaluatedDescription = eDescription;
 					break;

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java	2008-09-17 08:15:45 UTC (rev 1224)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ButtonList.java	2008-09-17 08:59:58 UTC (rev 1225)
@@ -41,7 +41,7 @@
 	 * @param editorKit EditorKit from Protege
 	 */
 	public ButtonList(OWLEditorKit editorKit) {
-		super(editorKit.getOWLModelManager().getOWLOntologyManager());
+		super(editorKit.getModelManager().getOWLOntologyManager());
 		// own OWLEquivalentClassesAxiomFrameSection to add the dllearner plugin
 		// to the
 		// OWLClassDescritpionEditor

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2008-09-17 08:15:45 UTC (rev 1224)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2008-09-17 08:59:58 UTC (rev 1225)
@@ -113,8 +113,8 @@
 	// This is the count of Concepts which you get after learning
 
 	// TODO make those configurable via user interface
-	private static final int nrOfDisplayedDescriptions = 6;
-	private static final double minAccuracy = 0.8;
+	private static final int NR_OF_DISPLAYED_DESCRIPTIONS = 6;
+	private static final double MIN_ACCURACY = 0.8;
 
 	// A Array of Concepts which the DL-Learner suggested
 
@@ -265,11 +265,11 @@
 	 * This method adds the solutions from the DL-Learner to the List Model.
 	 */
 	private void addToListModel() {
-		evalDescriptions = la.getCurrentlyBestEvaluatedDescriptions(nrOfDisplayedDescriptions, minAccuracy, true);
+		evalDescriptions = la.getCurrentlyBestEvaluatedDescriptions(NR_OF_DISPLAYED_DESCRIPTIONS, MIN_ACCURACY, true);
 		for (int j = 0; j < evalDescriptions.size(); j++) {
 			suggestModel.add(j, evalDescriptions.get(j)
 					.getDescription().toManchesterSyntaxString(
-							editor.getOWLModelManager().getActiveOntology()
+							editor.getModelManager().getActiveOntology()
 									.getURI().toString()
 									+ "#", null));
 		}
@@ -326,7 +326,7 @@
 	 * OWLAPIOntology will be available.
 	 */
 	public void setKnowledgeSource() {
-		this.source = new OWLAPIOntology(editor.getOWLModelManager()
+		this.source = new OWLAPIOntology(editor.getModelManager()
 				.getActiveOntology());
 	}
 
@@ -404,7 +404,7 @@
 		// start the algorithm and print the best concept found
 		la.start();
 		description = new Description[la.getCurrentlyBestEvaluatedDescriptions(
-				nrOfDisplayedDescriptions).size()];
+				NR_OF_DISPLAYED_DESCRIPTIONS).size()];
 		addToListModel();
 		// renders the errormessage
 		view.renderErrorMessage(error);
@@ -757,7 +757,7 @@
 			axiomOWLAPI = factory.getOWLSubClassAxiom(oldConceptOWLAPI,
 					newConceptOWLAPI);
 		}
-		OWLOntology onto = editor.getOWLModelManager().getActiveOntology();
+		OWLOntology onto = editor.getModelManager().getActiveOntology();
 		AddAxiom axiom = new AddAxiom(onto, axiomOWLAPI);
 		try {
 			// adds the new concept to the ontology
@@ -792,6 +792,6 @@
 	 * @return URI Ontology URI
 	 */
 	public URI getURI() {
-		return editor.getOWLModelManager().getActiveOntology().getURI();
+		return editor.getModelManager().getActiveOntology().getURI();
 	}
 }

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java	2008-09-17 08:15:45 UTC (rev 1224)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java	2008-09-17 08:59:58 UTC (rev 1225)
@@ -25,7 +25,7 @@
 import org.protege.editor.owl.OWLEditorKit;
 import org.protege.editor.owl.ui.frame.AbstractOWLFrameSectionRowObjectEditor;
 import org.protege.editor.owl.ui.clsdescriptioneditor.ExpressionEditor;
-import org.protege.editor.owl.ui.clsdescriptioneditor.OWLDescriptionChecker;
+//import org.protege.editor.owl.ui.clsdescriptioneditor.OWLDescriptionChecker;
 import org.protege.editor.owl.ui.selector.OWLClassSelectorPanel;
 import org.protege.editor.owl.ui.selector.OWLObjectPropertySelectorPanel;
 import org.semanticweb.owl.model.OWLDataFactory;
@@ -67,7 +67,7 @@
 
 	private OWLEditorKit editorKit;
 
-	private OWLDescriptionChecker checker;
+	//private OWLDescriptionChecker checker;
 
 	private ExpressionEditor<OWLDescription> editor;
 
@@ -219,7 +219,7 @@
 		try {
 			if (editor.isWellFormed()) {
 				String expression = editor.getText();
-				return editorKit.getOWLModelManager().getOWLDescriptionParser()
+				return editorKit.getModelManager().getOWLDescriptionParser()
 						.createOWLDescription(expression);
 			}
 			if (!dllearner.getSollutions().isEmpty()) {
@@ -230,6 +230,7 @@
 		} catch (OWLException e) {
 			return null;
 		}
+	
 	}
 	/**
 	 * Removes everything after protege is closed.
@@ -247,7 +248,7 @@
 	}
 
 	private OWLDataFactory getDataFactory() {
-		return editorKit.getOWLModelManager().getOWLDataFactory();
+		return editorKit.getModelManager().getOWLDataFactory();
 	}
 	/**
 	 * Adds a Status Changed Listener to all components of the 


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