Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [781] trunk/src/dl-learner/org/dllearner/tools/ore
|
From: <lor...@us...> - 2008-04-10 06:42:35
|
Revision: 781
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=781&view=rev
Author: lorenz_b
Date: 2008-04-09 23:42:27 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
added ListRenderers
added method getCorrectness to ORE to get Correctness of learned Concept
added correctness in view of JList in LearningPanel
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/IntroductionPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java
trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java
trunk/src/dl-learner/org/dllearner/tools/ore/Main.java
trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java
trunk/src/dl-learner/org/dllearner/tools/ore/Wizard.java
trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java
Added Paths:
-----------
trunk/src/dl-learner/org/dllearner/tools/ore/ColorListCellRenderer.java
trunk/src/dl-learner/org/dllearner/tools/ore/ColumnListCellRenderer.java
Added: trunk/src/dl-learner/org/dllearner/tools/ore/ColorListCellRenderer.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ColorListCellRenderer.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ColorListCellRenderer.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -0,0 +1,42 @@
+package org.dllearner.tools.ore;
+
+import java.awt.Color;
+import java.awt.Component;
+
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.ListCellRenderer;
+
+public class ColorListCellRenderer extends JLabel implements ListCellRenderer {
+
+ public ColorListCellRenderer() {
+ setOpaque(true);
+ }
+
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus) {
+
+ setText(value.toString());
+ Color background;
+ Color foreground;
+
+ if (index % 2 == 0 && !isSelected) {
+ background = new Color(242, 242, 242);
+ foreground = Color.BLACK;
+
+ } else if(isSelected){
+
+ background = Color.BLUE;
+ foreground = Color.WHITE;
+ }else{
+ background = Color.WHITE;
+ foreground = Color.BLACK;
+ }
+
+ setForeground(foreground);
+ setBackground(background);
+
+ return this;
+ }
+
+}
Added: trunk/src/dl-learner/org/dllearner/tools/ore/ColumnListCellRenderer.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ColumnListCellRenderer.java (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ColumnListCellRenderer.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -0,0 +1,60 @@
+package org.dllearner.tools.ore;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.ListCellRenderer;
+
+import org.dllearner.core.owl.Description;
+
+public class ColumnListCellRenderer extends JPanel implements ListCellRenderer {
+
+ private ORE ore;
+
+
+ public ColumnListCellRenderer(ORE ore) {
+ this.ore = ore;
+ setOpaque(true);
+ }
+
+ public Component getListCellRendererComponent(JList list, Object value,
+ int index, boolean isSelected, boolean cellHasFocus) {
+ removeAll();
+ JLabel cor = new JLabel();
+ JLabel desc = new JLabel();
+ setLayout(new BorderLayout());
+
+
+ desc.setText(value.toString());
+ cor.setText( (ore.getCorrectness((Description)value)).toString());
+
+ add(cor, BorderLayout.WEST);
+ add(desc, BorderLayout.EAST);
+
+ Color background;
+ Color foreground;
+
+ if (index % 2 == 0 && !isSelected) {
+ background = new Color(242, 242, 242);
+ foreground = Color.BLACK;
+
+ } else if(isSelected){
+
+ background = Color.BLUE;
+ foreground = Color.WHITE;
+ }else{
+ background = Color.WHITE;
+ foreground = Color.BLACK;
+ }
+
+ setForeground(foreground);
+ setBackground(background);
+
+ return this;
+ }
+
+}
\ No newline at end of file
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanel.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -29,29 +29,33 @@
private JXBusyLabel loadingLabel;
private JLabel statusLabel;
+ @SuppressWarnings("unchecked")
public ConceptPanel() {
super();
model = new DefaultListModel();
- loadingLabel = new JXBusyLabel(new Dimension(24,24));
+ loadingLabel = new JXBusyLabel(new Dimension(15,15));
statusLabel = new JLabel();
- BusyPainter<?> painter = new BusyPainter(
- new RoundRectangle2D.Float(0, 0,10.0f,3.2f,10.0f,10.0f),
- new Ellipse2D.Float(3.5f,3.5f,17.0f,17.0f));
- painter.setTrailLength(4);
- painter.setPoints(8);
+
+ BusyPainter painter = new BusyPainter(
+ new RoundRectangle2D.Float(0, 0,6.0f,2.6f,10.0f,10.0f),
+ new Ellipse2D.Float(2.0f,2.0f,11.0f,11.0f));
+ painter.setTrailLength(2);
+ painter.setPoints(7);
painter.setFrame(-1);
- loadingLabel.setPreferredSize(new Dimension(24,24));
- loadingLabel.setIcon(new EmptyIcon(24,24));
+ loadingLabel.setPreferredSize(new Dimension(15,15));
+ loadingLabel.setIcon(new EmptyIcon(15,15));
loadingLabel.setBusyPainter(painter);
-
+
+
JPanel labelPanel = new JPanel();
+ labelPanel.add(loadingLabel);
labelPanel.add(statusLabel);
- labelPanel.add(loadingLabel);
+
contentPanel = getContentPanel();
setLayout(new java.awt.BorderLayout());
add(contentPanel,BorderLayout.CENTER);
@@ -65,7 +69,8 @@
conceptList = new JList(model);
- scroll.setPreferredSize(new Dimension(200,200));
+ conceptList.setCellRenderer(new ColorListCellRenderer());
+ scroll.setPreferredSize(new Dimension(400,400));
scroll.setViewportView(conceptList);
contentPanel1.add(scroll);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanelDescriptor.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ConceptPanelDescriptor.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -24,15 +24,18 @@
}
- public Object getNextPanelDescriptor() {
+ @Override
+ public Object getNextPanelDescriptor() {
return LearningPanelDescriptor.IDENTIFIER;
}
- public Object getBackPanelDescriptor() {
+ @Override
+ public Object getBackPanelDescriptor() {
return KnowledgeSourcePanelDescriptor.IDENTIFIER;
}
- public void aboutToDisplayPanel() {
+ @Override
+ public void aboutToDisplayPanel() {
setNextButtonAccordingToConceptSelected();
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/IntroductionPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/IntroductionPanelDescriptor.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/IntroductionPanelDescriptor.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -10,11 +10,13 @@
super(IDENTIFIER, new IntroductionPanel());
}
- public Object getNextPanelDescriptor() {
+ @Override
+ public Object getNextPanelDescriptor() {
return KnowledgeSourcePanelDescriptor.IDENTIFIER;
}
- public Object getBackPanelDescriptor() {
+ @Override
+ public Object getBackPanelDescriptor() {
return null;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanel.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanel.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -21,7 +21,7 @@
public KnowledgeSourcePanel() {
-new LeftPanel(1);
+ new LeftPanel(1);
contentPanel = getContentPanel();
setLayout(new java.awt.BorderLayout());
@@ -72,11 +72,13 @@
filechooser.setCurrentDirectory(new File(fileURL.getText()));
filechooser.addChoosableFileFilter(new FileFilter() {
- public boolean accept(File f) {
+ @Override
+ public boolean accept(File f) {
if (f.isDirectory()) return true;
return f.getName().toLowerCase().endsWith(".owl");
}
- public String getDescription () { return "OWLs"; }
+ @Override
+ public String getDescription () { return "OWLs"; }
});
int status = filechooser.showOpenDialog( null );
@@ -119,7 +121,10 @@
public File getOWLFile() {
return new File(fileURL.getText());
}
-
+ public void setFileURL(String fileURL){
+ this.fileURL.setText(fileURL);
+ }
+
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanelDescriptor.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/KnowledgeSourcePanelDescriptor.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -15,7 +15,7 @@
public static final String IDENTIFIER = "KNOWLEDGESOURCE_CHOOSE_PANEL";
- KnowledgeSourcePanel panel2;
+ private KnowledgeSourcePanel panel2;
public KnowledgeSourcePanelDescriptor() {
@@ -28,16 +28,19 @@
}
- public Object getNextPanelDescriptor() {
+ @Override
+ public Object getNextPanelDescriptor() {
return ConceptPanelDescriptor.IDENTIFIER;
}
- public Object getBackPanelDescriptor() {
+ @Override
+ public Object getBackPanelDescriptor() {
return IntroductionPanelDescriptor.IDENTIFIER;
}
- public void aboutToDisplayPanel() {
+ @Override
+ public void aboutToDisplayPanel() {
setNextButtonAccordingToExistingOWLFile();
}
@@ -108,6 +111,9 @@
}
+public KnowledgeSourcePanel getPanel() {
+ return panel2;
+}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanel.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -3,6 +3,8 @@
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.event.ActionListener;
+import java.awt.geom.Ellipse2D;
+import java.awt.geom.RoundRectangle2D;
import javax.swing.DefaultListModel;
import javax.swing.JButton;
@@ -10,39 +12,73 @@
import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
+import javax.swing.ListSelectionModel;
+import javax.swing.table.DefaultTableModel;
+import org.jdesktop.swingx.JXBusyLabel;
+import org.jdesktop.swingx.JXTable;
+import org.jdesktop.swingx.decorator.HighlighterFactory;
+import org.jdesktop.swingx.icon.EmptyIcon;
+import org.jdesktop.swingx.painter.BusyPainter;
+
public class LearningPanel extends JPanel{
-
+ private JPanel contentPanel;
+
private javax.swing.JList resultList;
+ private DefaultListModel model;
- private JPanel contentPanel;
+ private JXTable resultTable;
+ private DefaultTableModel model1;
- private DefaultListModel model;
- private JLabel result;
+ private JLabel statusLabel;
+ private JXBusyLabel loadingLabel;
+
private JButton startButton;
private JButton stopButton;
+ @SuppressWarnings("unchecked")
public LearningPanel() {
super();
model = new DefaultListModel();
- result = new JLabel();
+
+ model1 = new DefaultTableModel();
+ model1.addColumn("Description");
+ model1.addColumn("Correctness");
+
+
JPanel buttonPanel = new JPanel();
startButton = new JButton("Start");
-
stopButton = new JButton("Stop");
stopButton.setEnabled(false);
-
buttonPanel.add(startButton);
buttonPanel.add(stopButton);
+
+
+ JPanel labelPanel = new JPanel();
+ statusLabel = new JLabel();
+
+ loadingLabel = new JXBusyLabel(new Dimension(15,15));
+ BusyPainter painter = new BusyPainter(
+ new RoundRectangle2D.Float(0, 0,6.0f,2.6f,10.0f,10.0f),
+ new Ellipse2D.Float(2.0f,2.0f,11.0f,11.0f));
+ painter.setTrailLength(2);
+ painter.setPoints(7);
+ painter.setFrame(-1);
+ loadingLabel.setPreferredSize(new Dimension(15,15));
+ loadingLabel.setIcon(new EmptyIcon(15,15));
+ loadingLabel.setBusyPainter(painter);
+ labelPanel.add(loadingLabel);
+ labelPanel.add(statusLabel);
+
contentPanel = getContentPanel();
setLayout(new java.awt.BorderLayout());
add(buttonPanel, BorderLayout.EAST);
add(contentPanel,BorderLayout.CENTER);
- add(result, BorderLayout.SOUTH);
+ add(labelPanel, BorderLayout.SOUTH);
}
private JPanel getContentPanel() {
@@ -50,9 +86,16 @@
JPanel contentPanel1 = new JPanel();
JScrollPane scroll = new JScrollPane();
-
+ resultTable = new JXTable(model1 );
+
+ resultTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ resultTable.setHighlighters(HighlighterFactory.createSimpleStriping());
+
+
resultList = new JList(model);
- scroll.setPreferredSize(new Dimension(300, 300));
+// resultList.setCellRenderer(new ColumnListCellRenderer());
+ scroll.setPreferredSize(new Dimension(400, 400));
+
scroll.setViewportView(resultList);
contentPanel1.add(scroll);
@@ -70,10 +113,14 @@
stopButton.addActionListener(a);
}
- public void setResult(String resultStr){
- result.setText(resultStr);
+ public JLabel getStatusLabel() {
+ return statusLabel;
}
+ public JXBusyLabel getLoadingLabel() {
+ return loadingLabel;
+ }
+
public JButton getStartButton() {
return startButton;
}
@@ -85,6 +132,10 @@
public DefaultListModel getModel() {
return model;
}
+
+// public DefaultTableModel getModel() {
+// return model1;
+// }
public javax.swing.JList getResultList() {
return resultList;
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/LearningPanelDescriptor.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.Timer;
import java.util.TimerTask;
+import java.util.Vector;
import java.util.concurrent.ExecutionException;
import javax.swing.SwingUtilities;
@@ -32,14 +33,17 @@
setPanelDescriptorIdentifier(IDENTIFIER);
setPanelComponent(panel4);
+
}
- public Object getNextPanelDescriptor() {
+ @Override
+ public Object getNextPanelDescriptor() {
return LearningPanelDescriptor.IDENTIFIER;
}
- public Object getBackPanelDescriptor() {
+ @Override
+ public Object getBackPanelDescriptor() {
return ConceptPanelDescriptor.IDENTIFIER;
}
@@ -51,11 +55,15 @@
@Override
public List<Description> doInBackground() {
-
+ panel4.getResultList().setCellRenderer(new ColumnListCellRenderer(getWizardModel().getOre()));
+ panel4.getLoadingLabel().setBusy(true);
+ panel4.getStatusLabel().setText("Learning");
la = getWizardModel().getOre().start();
timer = new Timer();
timer.schedule(new TimerTask() {
+ @SuppressWarnings("unchecked")
+ @Override
public void run() {
publish(getWizardModel().getOre().getLearningResults(5));
}
@@ -68,7 +76,10 @@
return result;
}
+ @Override
public void done() {
+
+
timer.cancel();
List<Description> result = null;
try {
@@ -78,10 +89,12 @@
} catch (ExecutionException e) {
e.printStackTrace();
}
+
panel4.getStartButton().setEnabled(true);
panel4.getStopButton().setEnabled(false);
updateList(result);
-
+ panel4.getLoadingLabel().setBusy(false);
+ panel4.getStatusLabel().setText("Algorithm terminated successfully.");
}
@Override
@@ -100,6 +113,8 @@
public void run() {
panel4.getModel().clear();
for (Description d : result) {
+ System.err.println(d+"=="+getWizardModel().getOre().getCorrectness(d));
+
panel4.getModel().addElement(d);
}
@@ -108,6 +123,37 @@
SwingUtilities.invokeLater(doUpdateList);
}
+
+// void updateList(final List<Description> result) {
+// Runnable doUpdateList = new Runnable() {
+//
+// public void run() {
+//
+//
+// int i = panel4.getModel().getRowCount();
+// if(!(i == 0))
+// for(int j = panel4.getModel().getRowCount(); j >= 0 ; j--){
+// System.out.println(panel4.getModel().getRowCount());
+// panel4.getModel().removeRow(j);
+// }
+//
+//
+//
+//
+// for (Description d : result) {
+// Object[] rowData = new Object[2];
+// rowData[0] = d;
+// rowData[1] = getWizardModel().getOre().getCorrectness(d);
+// System.err.println(d+"=="+rowData[1]);
+//
+// panel4.getModel().addRow(rowData );
+// }
+//
+// }
+// };
+// SwingUtilities.invokeLater(doUpdateList);
+//
+// }
public LearningAlgorithm getLa() {
return la;
@@ -126,7 +172,8 @@
else{
panel4.getStopButton().setEnabled(false);
worker.getLa().stop();
- panel4.getStartButton().setEnabled(true);
+ panel4.getStartButton().setEnabled(true);
+ panel4.getStatusLabel().setText("Algorithm aborted");
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/Main.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/Main.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/Main.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -26,7 +26,7 @@
}
Wizard wizard = new Wizard();
wizard.getDialog().setTitle("DL-Learner ORE-Tool");
- wizard.getDialog().setSize(700, 400);
+ wizard.getDialog().setSize(800, 500);
WizardPanelDescriptor descriptor1 = new IntroductionPanelDescriptor();
wizard.registerWizardPanel(IntroductionPanelDescriptor.IDENTIFIER, descriptor1);
@@ -40,9 +40,17 @@
WizardPanelDescriptor descriptor4 = new LearningPanelDescriptor();
wizard.registerWizardPanel(LearningPanelDescriptor.IDENTIFIER, descriptor4);
- wizard.setCurrentPanel(IntroductionPanelDescriptor.IDENTIFIER);
-
+ if ( !(args.length == 1)){
+ wizard.setCurrentPanel(IntroductionPanelDescriptor.IDENTIFIER);
+ }else{
+ ((KnowledgeSourcePanelDescriptor)descriptor2).getPanel().setFileURL(args[0]);
+ wizard.setCurrentPanel(KnowledgeSourcePanelDescriptor.IDENTIFIER);
+
+ }
+
+
int ret = wizard.showModalDialog();
+
System.out.println("Dialog return code is (0=Finish,1=Cancel,2=Error): " + ret);
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ORE.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -1,6 +1,8 @@
package org.dllearner.tools.ore;
import java.io.File;
+import java.math.BigDecimal;
+import java.util.List;
import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -20,8 +22,6 @@
import org.dllearner.learningproblems.PosNegDefinitionLP;
import org.dllearner.reasoning.OWLAPIReasoner;
-import java.util.List;
-
public class ORE {
private LearningAlgorithm la;
@@ -63,7 +63,6 @@
ReasonerComponent reasoner = cm.reasoner(
OWLAPIReasoner.class, ks);
-
try {
reasoner.init();
} catch (ComponentInitException e) {
@@ -117,9 +116,6 @@
}
}
-// public void setConcept(String conceptStr){
-// concept = new NamedClass(conceptStr);
-// }
public void setConcept(NamedClass concept){
this.concept = concept;
@@ -143,8 +139,38 @@
public List<Description> getLearningResults(int anzahl){
return la.getBestSolutions(anzahl);
}
+
+ public BigDecimal getCorrectness(Description d){
+ int numberPosExamples = 0;
+ int numberNegExamples = 0;
+ double result_tmp = 0.0f;
+
+ for(Individual ind : posExamples){
+ rs.instanceCheck(d, ind);
+ if(rs.instanceCheck(d, ind))
+ numberPosExamples++;
+ }
+ for(Individual ind : negExamples){
+ rs.instanceCheck(d, ind);
+ if(!rs.instanceCheck(d, ind))
+ numberNegExamples++;
+ }
+
+ result_tmp = ((float)(numberPosExamples) + (float)(numberNegExamples))/((float)(posExamples.size())+(float)(negExamples.size())) * 100;
+ BigDecimal result = new BigDecimal( result_tmp );
+ result = result.setScale( 2, BigDecimal.ROUND_HALF_UP );
+ return result;
+
+
+ }
+ public void addAxiomToOWL(Description desc){
+// OWLDescription newConceptOWLAPI = OWLAPIDescriptionConvertVisitor.getOWLDescription(desc);
+
+
+ }
+
public static void main(String[] args){
ORE test = new ORE();
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/Wizard.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/Wizard.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/Wizard.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -405,7 +405,8 @@
* @param WindowEvent The event passed in from AWT.
*/
- public void windowClosing(WindowEvent e) {
+ @Override
+ public void windowClosing(WindowEvent e) {
returnCode = CANCEL_RETURN_CODE;
}
Modified: trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java 2008-04-09 18:35:28 UTC (rev 780)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/WizardController.java 2008-04-10 06:42:27 UTC (rev 781)
@@ -161,18 +161,17 @@
}
}
- class ConceptRetriever extends SwingWorker<Set<NamedClass>, NamedClass>
- {
- Object nextPanelID;
-
- public ConceptRetriever(Object nextPanelDescriptor) {
-
- nextPanelID = nextPanelDescriptor;
- }
-
-
- public Set<NamedClass> doInBackground() {
+ class ConceptRetriever extends SwingWorker<Set<NamedClass>, NamedClass> {
+ Object nextPanelID;
+ public ConceptRetriever(Object nextPanelDescriptor) {
+
+ nextPanelID = nextPanelDescriptor;
+ }
+
+ @Override
+ public Set<NamedClass> doInBackground() {
+
((ConceptPanelDescriptor) wizard.getModel().getPanelHashMap().get(
nextPanelID)).panel3.getStatusLabel().setText(
"Loading concepts");
@@ -186,36 +185,38 @@
return ind;
}
-
- public void done(){
- Set<NamedClass> ind = null;
- try {
- ind = get();
- } catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ExecutionException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- ConceptPanelDescriptor nextPanel = (ConceptPanelDescriptor)wizard.getModel().getPanelHashMap().get(nextPanelID);
- DefaultListModel dm = new DefaultListModel();
-
- for (NamedClass cl : ind){
- dm.addElement(cl);
- //nextPanel.panel3.getModel().addElement(cl);
- System.out.println(cl.getName());
- }
- nextPanel.panel3.getList().setModel(dm);
- ((ConceptPanelDescriptor) wizard.getModel().getPanelHashMap().get(
+
+ @Override
+ public void done() {
+ Set<NamedClass> ind = null;
+ try {
+ ind = get();
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ExecutionException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ ConceptPanelDescriptor nextPanel = (ConceptPanelDescriptor) wizard
+ .getModel().getPanelHashMap().get(nextPanelID);
+ DefaultListModel dm = new DefaultListModel();
+
+ for (NamedClass cl : ind) {
+ dm.addElement(cl);
+ //nextPanel.panel3.getModel().addElement(cl);
+ System.out.println(cl.getName());
+ }
+ nextPanel.panel3.getList().setModel(dm);
+ ((ConceptPanelDescriptor) wizard.getModel().getPanelHashMap().get(
nextPanelID)).panel3.getStatusLabel().setText(
"Concepts loaded");
- ((ConceptPanelDescriptor)wizard.getModel().getPanelHashMap().get(nextPanelID)).panel3.getLoadingLabel().setBusy(false);
- }
-
-
- }
+ ((ConceptPanelDescriptor) wizard.getModel().getPanelHashMap().get(
+ nextPanelID)).panel3.getLoadingLabel().setBusy(false);
+ }
+ }
+
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
