From: <hee...@us...> - 2008-06-14 11:20:58
|
Revision: 960 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=960&view=rev Author: heeroyuy Date: 2008-06-14 04:20:56 -0700 (Sat, 14 Jun 2008) Log Message: ----------- -create own class for suggest panel Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-06-13 11:20:31 UTC (rev 959) +++ trunk/src/dl-learner/org/dllearner/tools/protege/ActionHandler.java 2008-06-14 11:20:56 UTC (rev 960) @@ -37,6 +37,7 @@ /** * */ + private SuggestClassPanel sugPanel; private OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view; /** * @@ -45,9 +46,10 @@ * @param view * @param i */ - public ActionHandler(ActionHandler a,DLLearnerModel m,OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view ,String i) + public ActionHandler(ActionHandler a,DLLearnerModel m,OWLClassDescriptionEditorWithDLLearnerTab.DLLearnerView view ,String i,SuggestClassPanel sugPanel) { this.view = view; + this.sugPanel = sugPanel; this.id=i; this.model = m; toggled = false; @@ -91,7 +93,7 @@ if(z.getActionCommand().equals("ADD")) { - model.changeDLLearnerDescriptionsToOWLDescriptions((Description)view.getSuggestionList().getSelectedValue()); + model.changeDLLearnerDescriptionsToOWLDescriptions((Description)sugPanel.getSuggestList().getSelectedValue()); String message ="Concept added"; view.renderErrorMessage(message); } Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-06-13 11:20:31 UTC (rev 959) +++ trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-06-14 11:20:56 UTC (rev 960) @@ -291,13 +291,10 @@ * */ private JPanel option; + /** * */ - private JList suggest; - /** - * - */ private JLabel neg; /** * @@ -354,10 +351,6 @@ /** * */ - private JScrollPane suggestScroll; - /** - * - */ private ActionHandler action; /** * @@ -371,6 +364,7 @@ * * @return */ + private SuggestClassPanel sugPanel; public DLLearnerViewPanel getDLLearnerViewPanel() { return panel; @@ -387,7 +381,8 @@ posLabelPanel = new JPanel(); negLabelPanel = new JPanel(); panel = new DLLearnerViewPanel(editor); - action = new ActionHandler(this.action, model,this,label); + sugPanel = new SuggestClassPanel(); + action = new ActionHandler(this.action, model,this,label,sugPanel); helpForPosExamples = new JButton("?"); helpForPosExamples.setSize(10, 10); adv = new JLabel("Advanced"); @@ -397,14 +392,13 @@ run = new JButton("Suggest "+label); cancel = new JButton("Cancel"); accept = new JButton("ADD"); + sugPanel.addSuggestPanelMouseListener(action); option = new JPanel(new GridLayout(0,2)); scrollPane = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); - suggestScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); errorMessage = new JLabel(); learner = new JPanel(); advanced.setSize(20,20); learner.setLayout(null); - suggest = new JList(); learner.setPreferredSize(new Dimension(600, 520)); pos = new JLabel("Positive Examples"); neg = new JLabel("Negative Examples"); @@ -435,20 +429,19 @@ model.initReasoner(); model.setPosVector(); setJCheckBoxen(); - suggest = new JList(model.getSuggestList()); cancel.setEnabled(false); accept.setEnabled(false); action.resetToggled(); + sugPanel.setSuggestList(model.getSuggestList()); + sugPanel = sugPanel.updateSuggestClassList(); advanced.setSelected(false); - suggest.setBounds(10,40,490,110); + sugPanel.setBounds(10,40,490,110); adv.setBounds(40,200,200,20); run.setBounds(10,0,200,30); advanced.setBounds(10,200,20,20); - suggest.setVisible(true); + sugPanel.setVisible(true); scrollPane.setViewportView(option); scrollPane.setBounds(10, 230, 490, 250); - suggestScroll.setViewportView(suggest); - suggestScroll.setBounds(10,40,490,110); cancel.setBounds(260,0,200,30); accept.setBounds(510,40,80,110); errorMessage.setBounds(10,160,590,20); @@ -456,13 +449,12 @@ learner.add(adv); learner.add(advanced); learner.add(cancel); - learner.add(suggestScroll); + learner.add(sugPanel); learner.add(accept); learner.add(errorMessage); learner.add(scrollPane); scrollPane.setVisible(false); add(learner); - suggest.addMouseListener(action); addListener(); } /** @@ -567,9 +559,7 @@ option.removeAll(); run.setEnabled(true); model.unsetNewConcepts(); - //model.unsetListModel(); action.destroyDLLearnerThread(); - suggest.removeAll(); errorMessage.setText(""); learner.removeAll(); } @@ -612,31 +602,16 @@ run.setEnabled(true); cancel.setEnabled(false); descriptions = model.getSuggestList(); - suggest=new JList(model.getSuggestList()); - suggest.setBounds(10,40,490,110); - suggest.setVisible(true); - suggestScroll.setViewportView(suggest); - suggestScroll.setBounds(10,40,490,110); - learner.add(suggestScroll); - suggest.repaint(); - suggest.addMouseListener(action); - suggestScroll.repaint(); + sugPanel.setSuggestList(descriptions); model.unsetJCheckBoxen(); option.removeAll(); setJCheckBoxen(); } + /** * * @return */ - public JList getSuggestionList() - { - return suggest; - } - /** - * - * @return - */ public JButton getRunButton() { return run; Added: trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/tools/protege/SuggestClassPanel.java 2008-06-14 11:20:56 UTC (rev 960) @@ -0,0 +1,63 @@ +package org.dllearner.tools.protege; + +import java.awt.Dimension; + +import javax.swing.*; +import javax.swing.event.ListSelectionListener; + +import org.dllearner.core.owl.Description; + +public class SuggestClassPanel extends JPanel { + + private static final long serialVersionUID = 724628423947230L; + + private JList descriptions; + private JPanel suggestPanel; + private DefaultListModel model; + private JScrollPane suggestScroll; + + public SuggestClassPanel() + { + super(); + suggestScroll = new JScrollPane(); + suggestScroll = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + model = new DefaultListModel(); + descriptions = new JList(model); + suggestPanel = new JPanel(); + descriptions.setVisible(true); + suggestPanel.add(descriptions); + suggestScroll.setPreferredSize(new Dimension(490,110)); + suggestScroll.setViewportView(descriptions); + add(suggestScroll); + } + + + public SuggestClassPanel updateSuggestClassList() + { + //JPanel suggestPanel1 = new JPanel(); + + //suggestScroll.setViewportView(suggestPanel1); + //descriptions = new JList(desc); + //descriptions.setVisible(true); + //suggestScroll.add(descriptions); + add(suggestScroll); + return this; + + } + public void setSuggestList(DefaultListModel desc) + { + descriptions.setModel(desc); + } + public JList getSuggestList() + { + return descriptions; + } + + public void addSuggestPanelMouseListener(ActionHandler action) + { + descriptions.addMouseListener(action); + } + + + +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |