From: <hee...@us...> - 2009-11-04 10:26:58
|
Revision: 1904 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1904&view=rev Author: heeroyuy Date: 2009-11-04 10:26:47 +0000 (Wed, 04 Nov 2009) Log Message: ----------- -fixed a bug Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 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-11-04 09:15:48 UTC (rev 1903) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2009-11-04 10:26:47 UTC (rev 1904) @@ -67,7 +67,10 @@ private final DLLearnerView view; private static final String HELP_BUTTON_STRING = "help"; private JTextArea help; + private static final String ADD_BUTTON_STRING = "<html>ADD</html>"; private static final String ADVANCED_BUTTON_STRING = "Advanced"; + private static final String EQUIVALENT_CLASS_LEARNING_STRING = "<html>suggest equivalent class expression</html>"; + private static final String SUPER_CLASS_LEARNING_STRING = "<html>suggest super class expression</html>"; /** * This is the constructor for the action handler. @@ -93,9 +96,9 @@ */ public void actionPerformed(ActionEvent z) { - if (z.getActionCommand().equals("suggest equivalent class expression") + if (z.getActionCommand().equals(EQUIVALENT_CLASS_LEARNING_STRING) || z.getActionCommand() - .equals("suggest super class expression")) { + .equals(SUPER_CLASS_LEARNING_STRING)) { model.setKnowledgeSource(); view.getSuggestClassPanel().getSuggestModel().clear(); view.getSuggestClassPanel().repaint(); @@ -107,8 +110,8 @@ String moreInformationsMessage = "Learning started. Currently searching class expressions with length between " + celoe.getMinimumHorizontalExpansion() - + " and" - + celoe.getMaximumHorizontalExpansion() + ". "; + + " and " + + celoe.getMaximumHorizontalExpansion() + "."; view.setHelpButtonVisible(true); view.setHintMessage(moreInformationsMessage); retriever = new SuggestionRetriever(); @@ -116,7 +119,7 @@ retriever.execute(); } - if (z.getActionCommand().equals("ADD")) { + if (z.getActionCommand().equals(ADD_BUTTON_STRING)) { if (evaluatedDescription != null) { model .changeDLLearnerDescriptionsToOWLDescriptions(evaluatedDescription @@ -150,7 +153,7 @@ + "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. "; + + "See <a href=\"http://dl-learner.org/wiki/ProtegePlugin\">http://dl-learner.org/wiki/ProtegePlugin</a> for more details."; help = new JTextArea(); help.setEditable(false); @@ -170,6 +173,14 @@ } /** + * This Methode sets the evaluated class expression that is selected + * in the panel. + * @param desc evaluated descriptions + */ + public void setEvaluatedClassExpression(EvaluatedDescription desc) { + this.evaluatedDescription = desc; + } + /** * Inner Class that retrieves the concepts given by the DL-Learner. * * @author Christian Koetteritzsch Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-04 09:15:48 UTC (rev 1903) +++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java 2009-11-04 10:26:47 UTC (rev 1904) @@ -152,7 +152,7 @@ icon = new ImageIcon(iconUrl); URL toggledIconUrl = this.getClass().getResource("arrow2.gif"); toggledIcon = new ImageIcon(toggledIconUrl); - adv = new JLabel("Advanced Settings"); + adv = new JLabel("<html>Advanced Settings</html>"); advanced = new JToggleButton(icon); advanced.setVisible(true); advancedPanel = new JPanel(); @@ -164,7 +164,7 @@ helpButton.setName("help"); helpButton.addActionListener(action); runPanel = new JPanel(new FlowLayout()); - accept = new JButton("ADD"); + accept = new JButton("<html>ADD</html>"); addButtonPanel = new JPanel(new BorderLayout()); stat = new StatusBar(); errorMessage = new JTextArea(); @@ -183,7 +183,7 @@ learnerScroll.getVerticalScrollBar().setUnitIncrement(SCROLL_SPEED); posPanel = new PosAndNegSelectPanel(model, action); detail = new MoreDetailForSuggestedConceptsPanel(model); - sugPanelHandler = new SuggestClassPanelHandler(this, model); + sugPanelHandler = new SuggestClassPanelHandler(this, model, action); sugPanel.addSuggestPanelMouseListener(sugPanelHandler); sugPanel.getSuggestList().addListSelectionListener(sugPanelHandler); this.addAcceptButtonListener(this.action); @@ -234,7 +234,7 @@ } individualSize = editorKit.getModelManager().getActiveOntology().getIndividualAxioms().size(); labels = currentConcept; - run.setText("suggest " + label + " expression"); + run.setText("<html>suggest " + label + " expression</html>"); GridBagConstraints c = new GridBagConstraints(); learner.remove(detail); model.setID(label); Modified: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-11-04 09:15:48 UTC (rev 1903) +++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanelHandler.java 2009-11-04 10:26:47 UTC (rev 1904) @@ -36,6 +36,7 @@ public class SuggestClassPanelHandler implements MouseListener, ListSelectionListener{ private DLLearnerView view; private DLLearnerModel model; + private ActionHandler action; private EvaluatedDescription evaluatedDescription; /** @@ -43,9 +44,10 @@ * @param v DLLearnerView * @param m DLLearnerModel */ - public SuggestClassPanelHandler(DLLearnerView v, DLLearnerModel m) { + public SuggestClassPanelHandler(DLLearnerView v, DLLearnerModel m, ActionHandler a) { this.view = v; this.model = m; + this.action = a; } @@ -68,6 +70,7 @@ if (desc.equals(eDescription.getDescription() .toManchesterSyntaxString(ont, null))) { evaluatedDescription = eDescription; + action.setEvaluatedClassExpression(eDescription); break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |