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

[<lor...@us...>]

Revision: 2282
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2282&view=rev
Author:   lorenz_b
Date:     2010-09-10 09:39:25 +0000 (Fri, 10 Sep 2010)

Log Message:
-----------
Small fix to get notified when the active ontology changed.

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/tools/protege/Manager.java
    trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/Manager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/Manager.java	2010-09-10 09:38:25 UTC (rev 2281)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/Manager.java	2010-09-10 09:39:25 UTC (rev 2282)
@@ -72,19 +72,14 @@
 	
 	private volatile boolean isPreparing = false;
 	
-	public static synchronized Manager getInstance(OWLEditorKit editorKit){
+	public static synchronized Manager getInstance(){
 		if(instance == null){
-			instance = new Manager(editorKit);
+			instance = new Manager();
 		}
 		return instance;
 	}
 	
-	public static synchronized Manager getInstance(){
-		return instance;
-	}
-	
-	private Manager(OWLEditorKit editorKit){
-		this.editorKit = editorKit;
+	private Manager(){
 		ComponentManager.setComponentClasses(components);
 		cm = ComponentManager.getInstance();
 	}
@@ -360,9 +355,6 @@
 	public void dispose() throws Exception {
 		reasoner.releaseKB();
 		cm.freeAllComponents();
-		editorKit.getOWLModelManager().removeListener(this);
-		editorKit.getOWLWorkspace().getOWLSelectionModel().removeListener(this);
-		
 	}
 
 }

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java	2010-09-10 09:38:25 UTC (rev 2281)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java	2010-09-10 09:39:25 UTC (rev 2282)
@@ -56,9 +56,9 @@
 	@Override
 	public boolean isValidInput() {
 		if(getAxiomType() == AxiomType.EQUIVALENT_CLASSES) {
-			Manager.getInstance(getOWLEditorKit()).setLearningType(LearningType.EQUIVALENT);
+			Manager.getInstance().setLearningType(LearningType.EQUIVALENT);
 		} else if(getAxiomType() == AxiomType.SUBCLASS_OF) {
-			Manager.getInstance(getOWLEditorKit()).setLearningType(LearningType.SUPER);
+			Manager.getInstance().setLearningType(LearningType.SUPER);
 		}
 		view.reset();
 		OWLReasoner r = getOWLEditorKit().getModelManager().getReasoner();
@@ -80,7 +80,7 @@
 
 	@Override
 	public void initialise() throws Exception {
-		Manager.getInstance(getOWLEditorKit());
+		Manager.getInstance().setOWLEditorKit(getOWLEditorKit());
 		view = new DLLearnerView(super.getOWLEditorKit());
 		Manager.getInstance().setProgressMonitor(view.getStatusBar());
 		System.out.println("Initializing DL-Learner plugin...");
@@ -106,12 +106,12 @@
 	}
 	
 	private void addListeners(){
-		getOWLEditorKit().getOWLModelManager().addListener(Manager.getInstance(getOWLEditorKit()));
-		getOWLEditorKit().getOWLWorkspace().getOWLSelectionModel().addListener(Manager.getInstance(getOWLEditorKit()));
+		getOWLEditorKit().getOWLModelManager().addListener(Manager.getInstance());
+		getOWLEditorKit().getOWLWorkspace().getOWLSelectionModel().addListener(Manager.getInstance());
 	}
 	
 	private void removeListeners(){
-		getOWLEditorKit().getOWLModelManager().removeListener(Manager.getInstance(getOWLEditorKit()));
-		getOWLEditorKit().getOWLWorkspace().getOWLSelectionModel().removeListener(Manager.getInstance(getOWLEditorKit()));
+		getOWLEditorKit().getOWLModelManager().removeListener(Manager.getInstance());
+		getOWLEditorKit().getOWLWorkspace().getOWLSelectionModel().removeListener(Manager.getInstance());
 	}
 }


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