From: <hee...@us...> - 2009-10-22 07:21:29
|
Revision: 1892 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1892&view=rev Author: heeroyuy Date: 2009-10-22 07:21:21 +0000 (Thu, 22 Oct 2009) Log Message: ----------- -code cleanup -fixed bug Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -23,9 +23,6 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import java.util.List; import java.util.Set; import java.util.Timer; @@ -37,10 +34,7 @@ import javax.swing.JTextArea; import javax.swing.SwingUtilities; import javax.swing.SwingWorker; -import javax.swing.event.ListDataEvent; -import javax.swing.event.ListDataListener; import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import org.dllearner.algorithms.celoe.CELOE; import org.dllearner.core.EvaluatedDescription; @@ -54,8 +48,7 @@ * @author Christian Koetteritzsch * */ -public class ActionHandler implements ActionListener, ItemListener, - MouseListener, ListSelectionListener, ListDataListener { +public class ActionHandler implements ActionListener { // This is the DLLearnerModel. @@ -122,8 +115,6 @@ view.setHintMessage(moreInformationsMessage); retriever = new SuggestionRetriever(); retriever.execute(); - // model.setCurrentConcept(null); - } if (z.getActionCommand().equals("ADD")) { @@ -154,19 +145,21 @@ } if (z.toString().contains(HELP_BUTTON_STRING)) { String helpText = "What does a sentence like 'Learning started. Currently searching class expressions with length between 4 and 7.' mean?\n" - + "Length: In Manchester OWL Syntax (the syntax used for class expressions in Protege), we define length simply as the number of words\n needed to write down the class expression." - + "The learning algorithm (called CELOE) for suggesting class expressions starts with the most general\n expression owl:Thing and then further specializes it. Those class expressions, which fit the existing instances of a given class ($currentClass in this case)\n get a high accuracy and are displayed as suggestions. The learning algorithm prefers short expressions.\n 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3\n or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7.\n If you want to search for longer expressions, then you have to increase the maximum runtime setting (it is set to $defaultRuntime seconds by default)\n." - + "See $wikiPage for more details. "; - + + "Length: In Manchester OWL Syntax (the syntax used for class expressions in Protege), we define length simply as the number of words needed to write down the class expression.\n\n" + + "The learning algorithm (called CELOE) for suggesting class expressions starts with the most general expression owl:Thing and then further specializes it.\n" + + "Those class expressions, which fit the existing instances of a given class ($currentClass in this case) get a high accuracy and are displayed as suggestions.\n" + + "The learning algorithm prefers short expressions. 'Currently searching class expressions with length between 4 and 7.' means that it has already evaluated all class expressions of length 1 to 3\n" + + "or excluded them as possible suggestions. All the expressions currently evaluated have length between 4 and 7. If you want to search for longer expressions, then you have to increase\n" + + "the maximum runtime setting (it is set to $defaultRuntime seconds by default).\n\n" + + "See http://dl-learner.org/wiki/ProtegePlugin for more details. "; + help = new JTextArea(); help.setEditable(false); help.setForeground(Color.black); help.setText(helpText); - JOptionPane.showMessageDialog(null, - help, - "Help", - JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(null, help, "Help", + JOptionPane.INFORMATION_MESSAGE); } } @@ -190,84 +183,8 @@ } - /** - * Nothing happens here. - * - * @param m - * MouseEvent - */ - public void mouseReleased(MouseEvent m) { - } - /** - * Nothing happens here. - * - * @param m - * MouseEvent - */ - public void mouseEntered(MouseEvent m) { - - } - - /** - * Choses the right EvaluatedDescription object after a concept is chosen in - * the list. - * - * @param m - * MouseEvent - */ - public void mouseClicked(MouseEvent m) { - if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) { - SuggestListItem item = (SuggestListItem) view - .getSuggestClassPanel().getSuggestList().getSelectedValue(); - String desc = item.getValue(); - if (model.getEvaluatedDescriptionList() != null) { - List<? extends EvaluatedDescription> evalList = model - .getEvaluatedDescriptionList(); - Set<String> onto = model.getOntologyURIString(); - for (EvaluatedDescription eDescription : evalList) { - for (String ont : onto) { - if (desc.equals(eDescription.getDescription() - .toManchesterSyntaxString(ont, null))) { - evaluatedDescription = eDescription; - break; - } - } - } - } - view.getMoreDetailForSuggestedConceptsPanel().renderDetailPanel( - evaluatedDescription); - view.setGraphicalPanel(); - view.getMoreDetailForSuggestedConceptsPanel().repaint(); - } - } - - /** - * Nothing happens here. - * - * @param m - * MouseEvent - */ - public void mouseExited(MouseEvent m) { - - } - - /** - * Sets the ADD button enable after a concept is chosen. - * - * @param m - * MouseEvent - */ - public void mousePressed(MouseEvent m) { - if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) { - if (!view.getAddButton().isEnabled()) { - view.getAddButton().setEnabled(true); - } - } - } - - /** * Destroys the Thread after the Pluigin is closed. */ public void destroyDLLearnerThread() { @@ -281,24 +198,6 @@ toggled = false; } - @Override - public void contentsChanged(ListDataEvent listEvent) { - System.out.println(listEvent); - - } - - @Override - public void intervalAdded(ListDataEvent listEvent) { - // TODO Auto-generated method stub - - } - - @Override - public void intervalRemoved(ListDataEvent listEvent) { - // TODO Auto-generated method stub - - } - /** * Inner Class that retrieves the concepts given by the DL-Learner. * @@ -389,9 +288,24 @@ for (List<? extends EvaluatedDescription> list : resultLists) { updateList(list); + this.checkSelectedItem(list); } } - + /* + * TODO: ueberlegen wegen umsetzung. + */ + private void checkSelectedItem(List<? extends EvaluatedDescription> result) { + if(!view.getSuggestClassPanel().getSuggestList().isSelectionEmpty()) { + SuggestListItem item = (SuggestListItem) view.getSuggestClassPanel().getSuggestList().getSelectedValue(); + String itemString = item.getValue(); + for(EvaluatedDescription desc: result) { + if(desc.getDescription().toString().equals(itemString)) { + + } + } + } + } + private void updateList( final List<? extends EvaluatedDescription> result) { Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -549,6 +549,12 @@ public boolean getIsKnowledgeSourceIsUpdated() { return knowledgeSourceIsUpdated; } + + /* + * TODO Add methods to get additional informations about a individual. + * Informations needed are the ones in the Individuals tab in protege. + */ + } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -40,6 +40,7 @@ import javax.swing.JToggleButton; import org.dllearner.algorithms.celoe.CELOE; +//import org.dllearner.tools.ore.ui.StatusBar; import org.protege.editor.owl.OWLEditorKit; import org.semanticweb.owl.model.OWLDescription; /** @@ -126,6 +127,8 @@ private boolean toogled = false; private String labels; private int individualSize; + private SuggestClassPanelHandler sugPanelHandler; + //private StatusBar stat; /** * The constructor for the DL-Learner tab in the class description @@ -140,7 +143,7 @@ model = new DLLearnerModel(editorKit, this); sugPanel = new SuggestClassPanel(model, this); learnerPanel = new JPanel(); - hintPanel = new JPanel(new BorderLayout()); + hintPanel = new JPanel(new FlowLayout()); learnerPanel.setLayout(new BorderLayout()); learnerScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); action = new ActionHandler(model, this); @@ -160,11 +163,10 @@ helpButton.setPreferredSize(new Dimension(20, 20)); helpButton.setName("help"); helpButton.addActionListener(action); - helpButton.setVisible(false); runPanel = new JPanel(new FlowLayout()); accept = new JButton("ADD"); addButtonPanel = new JPanel(new BorderLayout()); - sugPanel.addSuggestPanelMouseListener(action); + errorMessage = new JTextArea(); errorMessage.setEditable(false); hint = new JTextArea(); @@ -181,6 +183,9 @@ learnerScroll.getVerticalScrollBar().setUnitIncrement(SCROLL_SPEED); posPanel = new PosAndNegSelectPanel(model, action); detail = new MoreDetailForSuggestedConceptsPanel(model); + sugPanelHandler = new SuggestClassPanelHandler(this, model); + sugPanel.addSuggestPanelMouseListener(sugPanelHandler); + sugPanel.getSuggestList().addListSelectionListener(sugPanelHandler); this.addAcceptButtonListener(this.action); this.addRunButtonListener(this.action); this.addAdvancedButtonListener(this.action); @@ -208,6 +213,10 @@ */ public void makeView(String label) { run.setEnabled(false); + //stat = new StatusBar(); + helpButton.setVisible(false); + hint.setForeground(Color.BLACK); + hint.setText("To get suggestions for class expression, please click the button above."); String currentConcept = editorKit.getOWLWorkspace().getOWLSelectionModel().getLastSelectedClass().toString(); if(!labels.equals(currentConcept) || individualSize != editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size()) { if(individualSize != editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size()) { @@ -304,7 +313,6 @@ learnerScroll.setViewportView(learner); this.renderErrorMessage(""); this.getSuggestClassPanel().getSuggestModel().clear(); - this.getSuggestClassPanel().repaint(); } @@ -336,7 +344,6 @@ GridBagConstraints c = new GridBagConstraints(); learner.remove(posPanel); learner.remove(advancedPanel); - //learner.removeAll(); detail.setVisible(true); c.fill = GridBagConstraints.NONE; @@ -365,7 +372,6 @@ learnerScroll.setPreferredSize(new Dimension(SCROLL_WIDTH, SCROLL_HEIGHT)); learnerScroll.setViewportView(learner); - learnerScroll.repaint(); } /** * This Method changes the hint message. @@ -389,7 +395,7 @@ */ public void setExamplePanelVisible(boolean visible) { posPanel.setVisible(visible); - detail.repaint(); + //detail.repaint(); } /** @@ -515,12 +521,8 @@ message ="\nTo view details about why a class expression was suggested, please click on it."; } run.setEnabled(true); - // start the algorithm and print the best concept found - //renderErrorMessage(error); - //hint.setForeground(Color.BLACK); + // start the algorithm and print the best concept found; hint.append(message); - hint.repaint(); - //setHintMessage(message); } /** Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanel.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -110,7 +110,6 @@ eval = desc; model = m; panel = p; - this.repaint(); id = model.getID(); darkGreen = new Color(0, 100, 0); darkRed = new Color(205, 0, 0); @@ -373,14 +372,12 @@ g2D.drawString("cover the same instances.", 95, 220); } this.setVisible(true); - panel.repaint(); } } private void computeGraphics() { if (eval != null) { this.setVisible(true); - panel.repaint(); additionalIndividualSize = ((EvaluatedDescriptionClass) eval) .getAdditionalInstances().size(); distortionOld = 0; @@ -733,4 +730,5 @@ public EvaluatedDescription getEvaluateddescription() { return eval; } + } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/GraphicalCoveragePanelHandler.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -77,7 +77,6 @@ @Override public void mouseMoved(MouseEvent m) { - panel.getMoreDetailForSuggestedConceptsPanel().repaint(); if (m.getX() >= panel.getX1() + panel.getShiftCovered() && m.getX() <= panel.getX2() + panel.getShiftCovered() && m.getY() >= panel.getY1() && m.getY() <= panel.getY2() @@ -109,8 +108,6 @@ @Override public void propertyChange(PropertyChangeEvent arg0) { - panel.getMoreDetailForSuggestedConceptsPanel().repaint(); - panel.repaint(); } @Override @@ -121,7 +118,6 @@ && arg0.getY() >= panel.getY1() && arg0.getY() <= panel.getY2()) { - // panel.getMoreDetailForSuggestedConceptsPanel().repaint(); individualComboBox.clear(); Set<Individual> covInd = ((EvaluatedDescriptionClass) description) @@ -140,7 +136,6 @@ scrollPopup = new BasicComboPopup(indiBox); scrollPopup.setAutoscrolls(true); scrollPopup.show(panel, arg0.getX(), arg0.getY()); - // panel.getMoreDetailForSuggestedConceptsPanel().repaint(); } } @@ -158,7 +153,6 @@ && arg0.getY() <= panel.getY2() + panel.getShiftNewConcept()) { - // panel.getMoreDetailForSuggestedConceptsPanel().repaint(); individualComboBox.clear(); Set<Individual> addInd = ((EvaluatedDescriptionClass) description) .getAdditionalInstances(); @@ -176,7 +170,6 @@ scrollPopup = new BasicComboPopup(indiBox); scrollPopup.setAutoscrolls(true); scrollPopup.show(panel, arg0.getX(), arg0.getY()); - // panel.getMoreDetailForSuggestedConceptsPanel().repaint(); } } @@ -186,7 +179,6 @@ && arg0.getY() >= panel.getY1() && arg0.getY() <= panel.getY2()) { - // panel.getMoreDetailForSuggestedConceptsPanel().repaint(); individualComboBox.clear(); Set<Individual> notCovInd = model.getReasoner().getIndividuals( model.getCurrentConcept()); @@ -206,7 +198,6 @@ scrollPopup = new BasicComboPopup(indiBox); scrollPopup.setAutoscrolls(true); scrollPopup.show(panel, arg0.getX(), arg0.getY()); - // panel.getMoreDetailForSuggestedConceptsPanel().repaint(); } } } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/IndividualObject.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -27,6 +27,7 @@ private final String normalIndividual; private boolean isPos; + private String additionalInformation; /** * Constructor for the IndividualObject. @@ -61,5 +62,13 @@ public void setExamplePositive(boolean pos) { isPos = pos; } + + public void setAdditionalInformation(String additional) { + this.additionalInformation = additional; + } + + public String getAdditionalInformation() { + return additionalInformation; + } } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanel.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -121,11 +121,8 @@ conceptPanel.add(conceptText); conceptPanel.add(accuracyText); conceptPanel.setVisible(true); - //this.add(conceptPanel); this.add(p); this.addPropertyChangeListener(handler); - //conceptPanel.addPropertyChangeListener(handler); - this.repaint(); } private void unsetEverything() { @@ -191,7 +188,5 @@ conceptPanel.add(accuracyText); conceptPanel.setVisible(false); this.add(conceptPanel); - - repaint(); } } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/MoreDetailForSuggestedConceptsPanelHandler.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -40,7 +40,6 @@ @Override public void propertyChange(PropertyChangeEvent arg0) { panel.setInformation(); - panel.repaint(); } } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanel.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -191,51 +191,97 @@ return nrOfConcepts.getValue(); } + /** + * + * @return + */ public JRadioButton getOwlRadioButton() { return owlRadioButton; } + /** + * + * @return + */ public JRadioButton getElProfileButton() { return elProfileButton; } + /** + * + * @return + */ public boolean getAllBox() { return allBox.isSelected(); } + /** + * + * @return + */ public boolean getSomeBox() { return someBox.isSelected(); } + /** + * + * @return + */ public boolean getNotBox() { return notBox.isSelected(); } + /** + * + * @return + */ public boolean getValueBox() { return valueBox.isSelected(); } + /** + * + * @return + */ public JPanel getProfilePanel() { return profilePanel; } - + /** + * + * @return + */ public int getCountMoreBox() { return Integer.parseInt(countMoreBox.getSelectedItem().toString()); } + /** + * + * @return + */ public boolean getMoreBox() { return moreBox.isSelected(); } + /** + * + * @return + */ public JPanel getRadioBoxPanel() { return radioBoxPanel; } + /** + * + * @return + */ public JPanel getCheckBoxPanel() { return checkBoxPanel; } + /** + * + */ public void setToOWLProfile() { allBox.setSelected(true); someBox.setSelected(true); @@ -245,6 +291,9 @@ this.setCountMoreBoxEnabled(true); } + /** + * + */ public void setToELProfile() { allBox.setSelected(false); someBox.setSelected(true); @@ -254,6 +303,10 @@ this.setCountMoreBoxEnabled(false); } + /** + * + * @param isEnabled + */ public void setCountMoreBoxEnabled(boolean isEnabled) { countMoreBox.setEnabled(isEnabled); } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/OptionPanelHandler.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -1,3 +1,22 @@ +/** + * Copyright (C) 2007-2009, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ package org.dllearner.tools.protege; import java.awt.event.ItemEvent; @@ -3,4 +22,9 @@ import java.awt.event.ItemListener; +/** + * This class handles the all actions in the option panel. + * @author Christian Koetteritzsch + * + */ public class OptionPanelHandler implements ItemListener { @@ -11,12 +35,20 @@ private OptionPanel option; + /** + * This is the Constructor of the class. + * @param o Option Panel + */ public OptionPanelHandler(OptionPanel o) { this.option = o; } @Override + /** + * This method handles the actions to be taken if a + * radio button is selected/deselected. + */ public void itemStateChanged(ItemEvent e) { if (e.toString().contains(OWL_RADIO_STRING)) { if (option.getOwlRadioButton().isSelected()) { Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ProtegePlugin.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -60,7 +60,7 @@ @Override public boolean isValidInput() { view.getSuggestClassPanel().getSuggestModel().clear(); - view.getSuggestClassPanel().repaint(); + //view.getSuggestClassPanel().repaint(); if(this.getAxiomType().toString().equals(EQUIVALENT_CLASS_STRING)) { view.makeView("equivalent class"); } else if(this.getAxiomType().toString().equals(SUPERCLASS_STRING)) { Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-10-20 10:23:23 UTC (rev 1891) +++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -118,8 +118,6 @@ model .getCurrentlySelectedClassDescription(i)); view.setGraphicalPanel(); - view.getMoreDetailForSuggestedConceptsPanel() - .repaint(); } } @@ -129,8 +127,6 @@ } } } - descriptions.repaint(); - repaint(); } /** @@ -148,9 +144,8 @@ * @param action * ActionHandler */ - public void addSuggestPanelMouseListener(ActionHandler action) { - descriptions.addMouseListener(action); - + public void addSuggestPanelMouseListener(SuggestClassPanelHandler handle) { + descriptions.addMouseListener(handle); } /** Added: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-10-22 07:21:21 UTC (rev 1892) @@ -0,0 +1,128 @@ +/** + * Copyright (C) 2007-2009, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.tools.protege; + +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; +import java.util.List; +import java.util.Set; + +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; + +import org.dllearner.core.EvaluatedDescription; +/** + * This is the MouseListener for the Suggest Panel. + * @author Christian Koetteritzsch + * + */ +public class SuggestClassPanelHandler implements MouseListener, ListSelectionListener{ + private DLLearnerView view; + private DLLearnerModel model; + private EvaluatedDescription evaluatedDescription; + + /** + * This is the constructor for the SuggestClassPanelHandler. + * @param v DLLearnerView + * @param m DLLearnerModel + */ + public SuggestClassPanelHandler(DLLearnerView v, DLLearnerModel m) { + this.view = v; + this.model = m; + } + + + @Override + /** + * + */ + public void mouseClicked(MouseEvent e) { + if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) { + SuggestListItem item = (SuggestListItem) view + .getSuggestClassPanel().getSuggestList().getSelectedValue(); + String desc = item.getValue(); + if (model.getEvaluatedDescriptionList() != null) { + List<? extends EvaluatedDescription> evalList = model + .getEvaluatedDescriptionList(); + Set<String> onto = model.getOntologyURIString(); + for (EvaluatedDescription eDescription : evalList) { + for (String ont : onto) { + if (desc.equals(eDescription.getDescription() + .toManchesterSyntaxString(ont, null))) { + evaluatedDescription = eDescription; + break; + } + } + } + } + view.getSuggestClassPanel().getSuggestModel().indexOf(item); + view.getMoreDetailForSuggestedConceptsPanel().renderDetailPanel(evaluatedDescription); + view.setGraphicalPanel(); + } + } + + @Override + /** + * Nothing happens here. + */ + public void mouseEntered(MouseEvent e) { + + } + + @Override + /** + * Nothing happens here. + */ + public void mouseExited(MouseEvent e) { + + } + + @Override + /** + * + */ + public void mousePressed(MouseEvent e) { + if (view.getSuggestClassPanel().getSuggestList().getSelectedValue() != null) { + if (!view.getAddButton().isEnabled()) { + view.getAddButton().setEnabled(true); + } + } + } + + @Override + /** + * Nothing happens here. + */ + public void mouseReleased(MouseEvent e) { + + } + + + @Override + /* + * TODO: Ueberlegen wie ich das mit dem selektierten Objekt umsetze + */ + public void valueChanged(ListSelectionEvent e) { + Object selectedObject = view.getSuggestClassPanel().getSuggestList().getSelectedValue(); + + view.getSuggestClassPanel().getSuggestList().setSelectedValue(selectedObject, true); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |