From: <hee...@us...> - 2009-02-27 20:41:58
|
Revision: 1638 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1638&view=rev Author: heeroyuy Date: 2009-02-27 20:41:57 +0000 (Fri, 27 Feb 2009) Log Message: ----------- -started integrating the plugin in protege Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/plugin.xml 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 11:39:32 UTC (rev 1637) +++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-02-27 20:41:57 UTC (rev 1638) @@ -34,9 +34,7 @@ import javax.swing.JTextArea; import javax.swing.JToggleButton; -import org.protege.editor.core.ui.util.InputVerificationStatusChangedListener; import org.protege.editor.owl.OWLEditorKit; -import org.protege.editor.owl.ui.editor.OWLDescriptionEditor; import org.semanticweb.owl.model.OWLDescription; /** * This class is responsible for the view of the dllearner. It renders the @@ -45,13 +43,12 @@ * @author Christian Koetteritzsch * */ -public class DLLearnerView implements OWLDescriptionEditor{ +public class DLLearnerView extends JPanel{ private static final long serialVersionUID = 624829578325729385L; //private OWLClassDescriptionEditorWithDLLearnerTab mainWindow; // this is the Component which shows the view of the dllearner - private static final String TITLE = "DL-Learner"; private final JComponent learner; // Accept button to add the learned concept to the owl @@ -105,9 +102,9 @@ private final JTextArea hint; private boolean isInconsistent; // This is the Panel for more details of the suggested concept - private MoreDetailForSuggestedConceptsPanel detail; + private final MoreDetailForSuggestedConceptsPanel detail; //private OWLFrame<OWLClass> frame; - private ReadingOntologyThread readThread; + private final ReadingOntologyThread readThread; private final OWLEditorKit editorKit; /** @@ -151,29 +148,6 @@ addAcceptButtonListener(this.action); addRunButtonListener(this.action); addAdvancedButtonListener(this.action); - this.makeView(); - - - } - /** - * This method returns the SuggestClassPanel. - * @return SuggestClassPanel - */ - public SuggestClassPanel getSuggestClassPanel() { - return sugPanel; - } - /** - * This method returns the PosAndNegSelectPanel. - * @return PosAndNegSelectPanel - */ - public PosAndNegSelectPanel getPosAndNegSelectPanel() { - return posPanel; - } - - /** - * This Method renders the view of the plugin. - */ - public void makeView() { run.setEnabled(false); model.clearVector(); hint.setText("To get suggestions for class descriptions, please click the button above."); @@ -212,6 +186,29 @@ learner.add(errorMessage); learner.add(posPanel); detail = new MoreDetailForSuggestedConceptsPanel(model); + + + } + /** + * This method returns the SuggestClassPanel. + * @return SuggestClassPanel + */ + public SuggestClassPanel getSuggestClassPanel() { + return sugPanel; + } + /** + * This method returns the PosAndNegSelectPanel. + * @return PosAndNegSelectPanel + */ + public PosAndNegSelectPanel getPosAndNegSelectPanel() { + return posPanel; + } + + /** + * This Method renders the view of the plugin. + */ + public void makeView() { + //add(learner); } @@ -320,15 +317,6 @@ public void setIsInconsistent(boolean isIncon) { this.isInconsistent = isIncon; } - /** - * Destroys the view after the plugin is closed. - */ - @Override - public void dispose() { - run.removeActionListener(action); - accept.removeActionListener(action); - advanced.removeActionListener(action); - } /** * Adds Actionlistener to the run button. @@ -371,54 +359,7 @@ setHintMessage(message); } - @Override - public JComponent getComponent() { + public JComponent getLearnerView() { return learner; } - - @Override - public Set<OWLDescription> getDescriptions() { - return model.getDescriptions(); - } - - @Override - public String getEditorName() { - return TITLE; - } - - @Override - public boolean isValidInput() { - return true; - } - - @Override - public boolean setDescription(OWLDescription arg0) { - // TODO Auto-generated method stub - return true; - } - - @Override - public void addStatusChangedListener( - InputVerificationStatusChangedListener arg0) { - // TODO Auto-generated method stub - - } - - @Override - public void removeStatusChangedListener( - InputVerificationStatusChangedListener arg0) { - // TODO Auto-generated method stub - - } - @Override - public void setup(String arg0, String arg1, OWLEditorKit arg2) { - // TODO Auto-generated method stub - - } - @Override - public void initialise() throws Exception { - // TODO Auto-generated method stub - - } - } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/plugin.xml =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/plugin.xml 2009-02-27 11:39:32 UTC (rev 1637) +++ trunk/src/dl-learner/org/dllearner/tools/protege/META-INF/plugin.xml 2009-02-27 20:41:57 UTC (rev 1638) @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <plugin> <extension id="org.dllearner.tools.protege.ProtegePlugin" - point="org.protege.editor.owl.ui.editor"> + point="org.protege.editor.owl.ui.editor.description"> <label value="DL-Learner"/> <class value="org.dllearner.tools.protege.ProtegePlugin"/> </extension> Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-02-27 11:39:32 UTC (rev 1637) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-02-27 20:41:57 UTC (rev 1638) @@ -22,7 +22,6 @@ import java.util.Set; import javax.swing.JComponent; -import javax.swing.JLabel; import javax.swing.JPanel; import org.protege.editor.core.ui.util.InputVerificationStatusChangedListener; @@ -39,13 +38,13 @@ public class ProtegePlugin extends AbstractOWLDescriptionEditor { private static final long serialVersionUID = 728362819273927L; private JPanel test; - private SimpleViewTest tes; + private DLLearnerView view; @Override public JComponent getComponent() { System.out.println("1"); // TODO Auto-generated method stub - return test; + return view.getLearnerView(); } @Override @@ -58,6 +57,7 @@ @Override public boolean isValidInput() { System.out.println("3"); + view = new DLLearnerView("equivalent class", this.getOWLEditorKit()); // TODO Auto-generated method stub return true; } @@ -72,11 +72,8 @@ @Override public void initialise() throws Exception { System.out.println("5"); - tes = new SimpleViewTest(); - this.getOWLEditorKit().getOWLWorkspace().getOWLComponentFactory().getOWLClassDescriptionEditor(null).addPanel(tes); - test = new JPanel(); - test.add(new JLabel("TEST")); - + System.out.println("test: " + this.getOWLEditorKit().getOWLWorkspace().getViewManager().getClass()); + view = new DLLearnerView("equivalent class", this.getOWLEditorKit()); } @Override @@ -98,6 +95,7 @@ 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 11:39:32 UTC (rev 1637) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java 2009-02-27 20:41:57 UTC (rev 1638) @@ -50,7 +50,7 @@ private final OWLEditorKit editor; private final DLLearnerModel model; private boolean isInconsistent; - private final OWLFrame<OWLClass> current; + private final OWLClass current; private final DLLearnerView view; /** @@ -63,7 +63,7 @@ public ReadingOntologyThread(OWLEditorKit editorKit, OWLFrame<OWLClass> frame, DLLearnerView v, DLLearnerModel m) { ontologieURI = new HashSet<String>(); this.editor = editorKit; - current = frame; + current = editor.getOWLWorkspace().getOWLComponentFactory().getOWLClassSelectorPanel().getSelectedObject(); this.view = v; this.model = m; @@ -78,7 +78,7 @@ hasIndividuals = false; // checks if selected concept is thing when yes then it selects all // individuals - if (!(current.getRootObject() instanceof Thing)) { + if (!(current instanceof Thing)) { List<NamedClass> classList = reasoner.getAtomicConceptsList(); for(NamedClass concept : classList) { // if individuals is null @@ -87,7 +87,7 @@ for(String onto : ontologieURI) { if (concept.toString().contains(onto)) { if (concept.toString().equals( - onto + current.getRootObject().toString())) { + onto + current.toString())) { // if individuals is not null it gets all // individuals of // the concept This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |