From: <hee...@us...> - 2009-03-02 11:15:24
|
Revision: 1639 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1639&view=rev Author: heeroyuy Date: 2009-03-02 11:15:14 +0000 (Mon, 02 Mar 2009) Log Message: ----------- -fixed error that selected class isn't updated after restarting the plugin Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-02-27 20:41:57 UTC (rev 1638) +++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-03-02 11:15:14 UTC (rev 1639) @@ -46,8 +46,7 @@ public class DLLearnerView extends JPanel{ - private static final long serialVersionUID = 624829578325729385L; - //private OWLClassDescriptionEditorWithDLLearnerTab mainWindow; + private static final long serialVersionUID = 624829578325729385L; // this is the Component which shows the view of the dllearner private final JComponent learner; @@ -103,7 +102,6 @@ private boolean isInconsistent; // This is the Panel for more details of the suggested concept private final MoreDetailForSuggestedConceptsPanel detail; - //private OWLFrame<OWLClass> frame; private final ReadingOntologyThread readThread; private final OWLEditorKit editorKit; @@ -115,7 +113,6 @@ * @param label String */ public DLLearnerView(String label, OWLEditorKit editor) { - //mainWindow = dlLearner; editorKit = editor; wikiPane = new JLabel("<html>See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for an introduction.</html>"); URL iconUrl = this.getClass().getResource("arrow.gif"); @@ -130,7 +127,6 @@ advanced.setVisible(true); run = new JButton(label); accept = new JButton("ADD"); - System.out.println("blub"); addButtonPanel = new JPanel(new BorderLayout()); sugPanel.addSuggestPanelMouseListener(action); errorMessage = new JTextArea(); @@ -154,8 +150,7 @@ isInconsistent = false; readThread = new ReadingOntologyThread(editorKit, null, this, model); readThread.start(); - //TODO: runbutton wird auf enable gesetzt obwohl keine instanzdaten vorhanden sind. - + hint.setVisible(true); advanced.setIcon(icon); accept.setEnabled(false); @@ -362,4 +357,8 @@ public JComponent getLearnerView() { return learner; } + + public DLLearnerModel getDLLearnerModel() { + return model; + } } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-02-27 20:41:57 UTC (rev 1638) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-03-02 11:15:14 UTC (rev 1639) @@ -22,7 +22,6 @@ import java.util.Set; import javax.swing.JComponent; -import javax.swing.JPanel; import org.protege.editor.core.ui.util.InputVerificationStatusChangedListener; import org.protege.editor.owl.ui.editor.AbstractOWLDescriptionEditor; @@ -37,67 +36,50 @@ */ public class ProtegePlugin extends AbstractOWLDescriptionEditor { private static final long serialVersionUID = 728362819273927L; - private JPanel test; private DLLearnerView view; @Override public JComponent getComponent() { - System.out.println("1"); - // TODO Auto-generated method stub return view.getLearnerView(); } @Override public Set<OWLDescription> getDescriptions() { - System.out.println("2"); - // TODO Auto-generated method stub - return null; + return view.getDLLearnerModel().getNewOWLDescription(); } @Override public boolean isValidInput() { - System.out.println("3"); + System.out.println("testen2: " + super.getOWLEditorKit().getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass()); + System.out.println("testen: " + super.getOWLEditorKit().getWorkspace()); view = new DLLearnerView("equivalent class", this.getOWLEditorKit()); - // TODO Auto-generated method stub return true; } @Override public boolean setDescription(OWLDescription arg0) { - System.out.println("4"); - // TODO Auto-generated method stub return true; } @Override public void initialise() throws Exception { - System.out.println("5"); - System.out.println("test: " + this.getOWLEditorKit().getOWLWorkspace().getViewManager().getClass()); - view = new DLLearnerView("equivalent class", this.getOWLEditorKit()); + view = new DLLearnerView("equivalent class", super.getOWLEditorKit()); } @Override public void dispose() throws Exception { - System.out.println("6"); - // TODO Auto-generated method stub - + view = null; } @Override public void addStatusChangedListener( InputVerificationStatusChangedListener arg0) { - System.out.println("7"); - // TODO Auto-generated method stub - } @Override public void removeStatusChangedListener( InputVerificationStatusChangedListener arg0) { - System.out.println("8"); view = null; - // TODO Auto-generated method stub - } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-02-27 20:41:57 UTC (rev 1638) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-03-02 11:15:14 UTC (rev 1639) @@ -63,7 +63,7 @@ public ReadingOntologyThread(OWLEditorKit editorKit, OWLFrame<OWLClass> frame, DLLearnerView v, DLLearnerModel m) { ontologieURI = new HashSet<String>(); this.editor = editorKit; - current = editor.getOWLWorkspace().getOWLComponentFactory().getOWLClassSelectorPanel().getSelectedObject(); + current = editor.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass(); this.view = v; this.model = m; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |