[DL-Learner SVN] SF.net SVN: dl-learner:[1845] trunk/src/dl-learner/org/dllearner/tools/ore

[<lor...@us...>]

Revision: 1845
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1845&view=rev
Author:   lorenz_b
Date:     2009-09-14 09:59:30 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------


Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/tools/ore/explanation/RootFinder.java
    trunk/src/dl-learner/org/dllearner/tools/ore/explanation/laconic/LaconicExplanationGenerator.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTableModel.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/LearningPanelDescriptor.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java

Added Paths:
-----------
    trunk/src/dl-learner/org/dllearner/tools/ore/close.png
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsDialog.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsTable.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsTableModel.java

Removed Paths:
-------------
    trunk/src/dl-learner/org/dllearner/tools/ore/recent.txt

Property Changed:
----------------
    trunk/src/dl-learner/org/dllearner/tools/ore/


Property changes on: trunk/src/dl-learner/org/dllearner/tools/ore
___________________________________________________________________
Added: svn:ignore
   + recent.txt


Added: trunk/src/dl-learner/org/dllearner/tools/ore/close.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/dl-learner/org/dllearner/tools/ore/close.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/RootFinder.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/RootFinder.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/RootFinder.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -21,6 +21,7 @@
 import org.semanticweb.owl.inference.OWLReasonerFactory;
 import org.semanticweb.owl.model.AddAxiom;
 import org.semanticweb.owl.model.AxiomType;
+import org.semanticweb.owl.model.OWLAxiom;
 import org.semanticweb.owl.model.OWLClass;
 import org.semanticweb.owl.model.OWLDataAllRestriction;
 import org.semanticweb.owl.model.OWLDataExactCardinalityRestriction;
@@ -76,6 +77,8 @@
     
     private Map<OWLClass, Set<OWLClass>> child2Parents;
     private Map<OWLClass, Set<OWLClass>> parent2Children;
+    
+    private Map<OWLClass, Map<OWLAxiom, Set<OWLClass>>> class2Dependency;
 	
 	public RootFinder(){
 		
@@ -98,6 +101,8 @@
 		child2Parents = new HashMap<OWLClass, Set<OWLClass>>();
 		parent2Children = new HashMap<OWLClass, Set<OWLClass>>();
 		
+		class2Dependency = new HashMap<OWLClass, Map<OWLAxiom, Set<OWLClass>>>();
+		
 		OREManager.getInstance().addListener(this);
 		RepairManager.getInstance(OREManager.getInstance()).addListener(this);
 //		OREManager.getInstance().getPelletReasoner().getOWLOntologyManager().addOntologyChangeListener(this);

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/laconic/LaconicExplanationGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/laconic/LaconicExplanationGenerator.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/laconic/LaconicExplanationGenerator.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -172,7 +172,7 @@
 						nonLaconicExplanations.add(currentExplanation);
 					}
 					if (laconicExplanations.size() == limit) {
-						return laconicExplanations;//retrieveAxioms(laconicJusts);
+						return laconicExplanations;//retrieveAxioms(laconicExplanations);
 					}
 				}
 			}
@@ -189,7 +189,7 @@
 			}
 		}
 
-		return explanations;//retrieveAxioms(explanations);
+		return laconicExplanations;//retrieveAxioms(explanations);
 	}
     
     public boolean isLaconic(Explanation explanation)
@@ -205,12 +205,10 @@
 
 			PelletExplanationGenerator expGen2 = new PelletExplanationGenerator(manager,
 					Collections.singleton(justificationSigmaClosureOnt));
-//			Set<Set<OWLAxiom>> exps = expGen2.getEntailmentExplanations(
-//					entailment, 2);
-			Explanation expl = expGen2.getExplanation(explanation.getEntailment());
+			Set<Explanation> exps = expGen2.getExplanations(
+					explanation.getEntailment(), 2);
 
-//			laconic = Collections.singleton(justification).equals(exps);
-			laconic = explanation.equals(expl);
+			laconic = Collections.singleton(explanation).equals(exps);
 
 		} catch (OWLOntologyCreationException e) {
 			throw new ExplanationException(e);
@@ -337,13 +335,13 @@
     
     public Set<OWLAxiom> getRemainingAxioms(OWLAxiom source, OWLAxiom part){
     	Set<OWLAxiom> parts = computeOPlus(Collections.singleton(source));
-    	for(OWLAxiom ax : parts){
+//    	for(OWLAxiom ax : parts){
 //    		System.out.println("Part: " + ax);
-    		for(OWLAxiom a : oPlus.getAxiomsMap().get(ax)){
+//    		for(OWLAxiom a : oPlus.getAxiomsMap().get(ax)){
 //    			System.out.println("has source: " + a);
-    		}
-    		
-    	}
+//    		}
+//    		
+//    	}
     	
     	for(OWLAxiom par : parts){
 //    		System.out.println("has Part: " + par);

Deleted: trunk/src/dl-learner/org/dllearner/tools/ore/recent.txt
===================================================================
(Binary files differ)

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -57,7 +57,7 @@
 		
 		repMan.addListener(this);
 		setBackground(Color.WHITE);
-		setHighlighters(HighlighterFactory.createAlternateStriping());
+//		setHighlighters(HighlighterFactory.createAlternateStriping());
 		setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
 		setModel(new ExplanationTableModel(exp,	cl));
 		TableColumn column5 = getColumn(4);

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTableModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTableModel.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTableModel.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -1,14 +1,26 @@
 package org.dllearner.tools.ore.ui;
 
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Insets;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
 import javax.swing.table.AbstractTableModel;
 
 import org.dllearner.tools.ore.ExplanationManager;
 import org.dllearner.tools.ore.ImpactManager;
 import org.dllearner.tools.ore.OREManager;
 import org.dllearner.tools.ore.RepairManager;
+import org.dllearner.tools.ore.TaskManager;
 import org.dllearner.tools.ore.explanation.Explanation;
 import org.semanticweb.owl.model.AddAxiom;
 import org.semanticweb.owl.model.OWLAxiom;
@@ -89,18 +101,24 @@
 					repMan.removeFromRepairPlan(new RemoveAxiom(ont, ax));
 				}
 			} else {
-				impMan.addSelection(ax);
+//				impMan.addSelection(ax);
 				if(expMan.isLaconicMode() && !ont.containsAxiom(ax)){
-					List<OWLOntologyChange> changes = new ArrayList<OWLOntologyChange>();
-					for(OWLAxiom source : expMan.getSourceAxioms(ax)){
-						impMan.addSelection(source);
-						changes.add(new RemoveAxiom(ont, source));
-						for(OWLAxiom remain : expMan.getRemainingAxioms(source, ax)){
-							changes.add(new AddAxiom(ont, remain));
-						}
-						
+//					List<OWLOntologyChange> changes = new ArrayList<OWLOntologyChange>();
+//					for(OWLAxiom source : expMan.getSourceAxioms(ax)){
+//						impMan.addSelection(source);
+//						changes.add(new RemoveAxiom(ont, source));
+//						for(OWLAxiom remain : expMan.getRemainingAxioms(source, ax)){
+//							changes.add(new AddAxiom(ont, remain));
+//						}
+//						
+//					}
+					RemainingAxiomsDialog dialog = new RemainingAxiomsDialog(ax, ont);
+					int ret = dialog.showDialog();
+					if(ret == RemainingAxiomsDialog.OK_RETURN_CODE){
+						impMan.addSelection(ax);
+						repMan.addToRepairPlan(dialog.getChanges());
 					}
-					repMan.addToRepairPlan(changes);
+					
 				} else {
 					repMan.addToRepairPlan(new RemoveAxiom(ont, ax));
 				}
@@ -127,8 +145,9 @@
 	
 	@Override
 	public boolean isCellEditable(int rowIndex, int columnIndex) {
-		if(columnIndex == 3 || columnIndex == 4)
+		if(columnIndex == 3 || columnIndex == 4){
 			return true;
+		}
 		return false;
 	}
 	
@@ -149,6 +168,4 @@
 		}
 	}
 	
-	
-
 }

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -111,7 +111,7 @@
 
 		this.setPreferredSize(new Dimension(540, 260));
 		
-		this.repaint();
+//		this.repaint();
 		darkGreen = new Color(0, 100, 0);
 		darkRed = new Color(205, 0, 0);
 		random = new Random();

Added: trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsDialog.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsDialog.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsDialog.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -0,0 +1,165 @@
+package org.dllearner.tools.ore.ui;
+
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.swing.BorderFactory;
+import javax.swing.Box;
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+
+import org.dllearner.tools.ore.ExplanationManager;
+import org.dllearner.tools.ore.OREManager;
+import org.dllearner.tools.ore.TaskManager;
+import org.semanticweb.owl.model.AddAxiom;
+import org.semanticweb.owl.model.OWLAxiom;
+import org.semanticweb.owl.model.OWLOntology;
+import org.semanticweb.owl.model.OWLOntologyChange;
+import org.semanticweb.owl.model.RemoveAxiom;
+
+public class RemainingAxiomsDialog extends JDialog implements ActionListener{
+	
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8019086232940177286L;
+	
+		private JComponent explanationsPanel;
+		private Set<RemainingAxiomsTable> tables;
+		
+		public static final int CANCEL_RETURN_CODE = 0;
+		public static final int OK_RETURN_CODE = 1;
+		
+		private int returnCode;
+		
+		@SuppressWarnings("unused")
+		private JButton okButton = null;
+		@SuppressWarnings("unused")
+		private JButton cancelButton = null;
+		
+		private List<OWLOntologyChange> changes;
+		private List<OWLAxiom> sourceAxioms;
+		
+		private ExplanationManager expMan;
+		
+		private OWLOntology ontology;
+		
+		
+		public RemainingAxiomsDialog(OWLAxiom laconicAxiom, OWLOntology ont){
+			super(TaskManager.getInstance().getDialog(), "Selected part of axiom in ontology", true);
+			setLayout(new BorderLayout());
+			
+			createControls();
+			
+			this.ontology = ont;
+			
+			tables = new HashSet<RemainingAxiomsTable>();
+			explanationsPanel = new Box(1);
+			
+			expMan = ExplanationManager.getInstance(OREManager.getInstance());
+			
+			changes = new ArrayList<OWLOntologyChange>();
+			sourceAxioms = new ArrayList<OWLAxiom>();
+			
+			sourceAxioms.addAll(expMan.getSourceAxioms(laconicAxiom));
+			
+			for(OWLAxiom source : sourceAxioms){
+				
+				changes.add(new RemoveAxiom(ont, source));
+				List<OWLAxiom> remainingAxioms = new ArrayList<OWLAxiom>(expMan.getRemainingAxioms(source, laconicAxiom));
+				RemainingAxiomsTable table = new RemainingAxiomsTable(remainingAxioms);
+				tables.add(table);
+				explanationsPanel.add(table);
+				
+			}
+			
+			add(explanationsPanel, BorderLayout.NORTH);
+			
+	
+		}
+		
+		private void createControls() {
+			Box buttonBox = Box.createHorizontalBox();
+
+			// Create a panel to hold a box with the buttons in it - to give it the
+			// right space around them
+			JPanel buttonPanel = new JPanel();
+			buttonPanel.add(buttonBox);
+			buttonPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+
+			// Create the buttons and add them to the box (leading strut will give
+			// the dialog box its width)
+			buttonBox.add(okButton = createButton("Ok", 'o'));
+			buttonBox.add(Box.createHorizontalGlue());
+			buttonBox.add(Box.createHorizontalStrut(4));
+			buttonBox.add(cancelButton = createButton("Cancel", 'c'));
+			buttonBox.add(Box.createHorizontalStrut(10));
+
+			// Add the button panel to the bottom of the BorderLayout
+			getContentPane().add(buttonPanel, BorderLayout.SOUTH);
+		}
+
+	private JButton createButton(String label, char mnemonic) {
+		// Create the new button object
+		JButton newButton = new JButton(label);
+		newButton.setActionCommand(label);
+
+		newButton.setPreferredSize(new Dimension(90, 30));
+		newButton.setMargin(new Insets(2, 2, 2, 2));
+
+		if (mnemonic != '\0') {
+			// Specify the button's mnemonic
+			newButton.setMnemonic(mnemonic);
+		}
+
+		// Setup the dialog to listen to events
+		newButton.addActionListener(this);
+
+		return newButton;
+	}
+	
+	 public int showDialog(){
+		 setSize(700, 400);
+		 setVisible(true);
+		 setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);	 
+		 return returnCode;
+	 }
+
+	private void closeDialog() {
+		setVisible(false);
+		dispose();
+	}
+	
+	public List<OWLOntologyChange> getChanges(){
+	
+		for(RemainingAxiomsTable table : tables){
+			for(OWLAxiom ax : table.getSelectedAxioms()){
+				changes.add(new AddAxiom(ontology, ax));
+			}
+		}
+		return changes;
+	}
+
+	@Override
+	public void actionPerformed(ActionEvent e) {
+		if (e.getActionCommand().equals("Ok")) {
+			returnCode = OK_RETURN_CODE;
+			closeDialog();
+		} else {
+			returnCode = CANCEL_RETURN_CODE;
+			closeDialog();
+
+		}
+	}
+
+}

Added: trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsTable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsTable.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsTable.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -0,0 +1,29 @@
+package org.dllearner.tools.ore.ui;
+
+import java.awt.Color;
+import java.util.List;
+
+import org.jdesktop.swingx.JXTable;
+import org.semanticweb.owl.model.OWLAxiom;
+
+public class RemainingAxiomsTable extends JXTable{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8948590659747547909L;
+
+	public RemainingAxiomsTable(List<OWLAxiom> remainingAxioms) {
+		
+		setBackground(Color.WHITE);
+		setModel(new RemainingAxiomsTableModel(remainingAxioms));
+		setRowHeight(getRowHeight() + 5);
+		getColumn(0).setCellRenderer(new ManchesterSyntaxTableCellRenderer());
+		getColumn(1).setMaxWidth(30);
+	}
+	
+	public List<OWLAxiom> getSelectedAxioms(){
+		return ((RemainingAxiomsTableModel)getModel()).getSelectedAxioms();
+	}
+
+}

Added: trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsTableModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsTableModel.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/RemainingAxiomsTableModel.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -0,0 +1,80 @@
+package org.dllearner.tools.ore.ui;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.table.AbstractTableModel;
+
+import org.semanticweb.owl.model.OWLAxiom;
+
+public class RemainingAxiomsTableModel extends AbstractTableModel {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7214659543838574629L;
+	private List<OWLAxiom> remainingAxioms;
+	private List<Boolean> selectionList;
+	
+	public RemainingAxiomsTableModel(List<OWLAxiom> remainingAxioms){
+		this.remainingAxioms = remainingAxioms;
+		selectionList = new ArrayList<Boolean>(remainingAxioms.size());
+		for(int i = 0; i < remainingAxioms.size(); i++ ){
+			selectionList.add(i, Boolean.FALSE);
+		}
+	}
+
+	@Override
+	public int getColumnCount() {
+		return 2;
+	}
+
+	@Override
+	public int getRowCount() {
+		return remainingAxioms.size();
+	}
+
+	@Override
+	public Object getValueAt(int rowIndex, int columnIndex) {
+		if(columnIndex == 0){
+			return remainingAxioms.get(rowIndex);
+		} else {
+			return selectionList.get(rowIndex);
+		}
+	}
+	@Override
+	public boolean isCellEditable(int rowIndex, int columnIndex) {
+		if(columnIndex == 0){
+			return false;
+		}
+		return true;
+	}
+	
+	@Override
+	public void setValueAt(Object value, int rowIndex, int columnIndex) {
+		if(columnIndex == 1){
+			selectionList.set(rowIndex, (Boolean)value);
+		}
+		super.setValueAt(value, rowIndex, columnIndex);
+	}
+	
+	@Override
+	public Class<?> getColumnClass(int columnIndex) {
+		if(columnIndex == 0) {
+			return OWLAxiom.class;
+		} else {
+			return Boolean.class;
+		}
+	}
+	
+	public List<OWLAxiom> getSelectedAxioms(){
+		List<OWLAxiom> selectedAxioms = new ArrayList<OWLAxiom>();
+		for(int i = 0; i < remainingAxioms.size(); i++){
+			if(selectionList.get(i) == Boolean.TRUE){
+				selectedAxioms.add(remainingAxioms.get(i));
+			}
+		}
+		return selectedAxioms;
+	}
+
+}

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -14,7 +14,9 @@
 import java.awt.geom.Ellipse2D;
 import java.util.Set;
 
+import javax.swing.BorderFactory;
 import javax.swing.Icon;
+import javax.swing.ImageIcon;
 import javax.swing.JButton;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
@@ -23,7 +25,6 @@
 import javax.swing.SwingUtilities;
 
 import org.mindswap.pellet.utils.progress.ProgressMonitor;
-import org.protege.editor.core.ui.list.MListDeleteButton;
 import org.semanticweb.owl.model.OWLAxiom;
 
 import com.clarkparsia.explanation.util.ExplanationProgressMonitor;
@@ -65,8 +66,10 @@
 			}
 		});
 		rB.setToolTipText("Abort");
-		leftPanel.add(rB);
+//		leftPanel.add(rB);
 		
+		leftPanel.add(new Cancel());
+		
 		leftPanel.add(progressBar);
 		leftPanel.add(new JSeparator(JSeparator.VERTICAL));
 		leftPanel.add(infoLabel);
@@ -337,5 +340,29 @@
 	    }
 	    return shape.contains(x, y);
 	  }
+	  
+	
 }
 
+class Cancel extends JButton {
+
+	public Cancel() {
+		super();
+		setIcon(new ImageIcon(
+				"src/dl-learner/org/dllearner/tools/ore/close.png"));
+		setBorder(BorderFactory.createEmptyBorder(2, 2, 2, 2));
+		setHorizontalAlignment(JButton.LEADING); // optional
+		setBorderPainted(false);
+		setContentAreaFilled(false);
+	}
+	
+	@Override
+	protected void paintComponent(Graphics g) {
+		if(getModel().isArmed()){
+			g.setColor(Color.YELLOW);
+		}
+		super.paintComponent(g);
+	}
+
+}
+

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -21,16 +21,13 @@
 package org.dllearner.tools.ore.ui.wizard;
 
 
-import java.awt.Cursor;
 import java.awt.event.ActionListener;
 import java.util.List;
 
 import javax.swing.JOptionPane;
-import javax.swing.SwingWorker;
 
 import org.dllearner.core.owl.Description;
 import org.dllearner.tools.ore.OREManager;
-import org.dllearner.tools.ore.ui.StatusBar;
 import org.dllearner.tools.ore.ui.wizard.descriptors.ClassChoosePanelDescriptor;
 import org.dllearner.tools.ore.ui.wizard.descriptors.InconsistencyExplanationPanelDescriptor;
 import org.dllearner.tools.ore.ui.wizard.descriptors.KnowledgeSourcePanelDescriptor;
@@ -348,36 +345,4 @@
         
     }
     
-    
-    class ClassificationWorker extends SwingWorker<Void, Void>{
-		
-		private StatusBar statusBar;
-		
-		public ClassificationWorker(StatusBar statusBar) {
-			this.statusBar = statusBar;
-//			OREManager.getInstance().getPelletReasoner().addProgressMonitor(new ClassificationProgressMonitor());
-			
-		}
-
-		@Override
-		public Void doInBackground() {
-			statusBar.showProgress(true);
-			wizard.getDialog().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-			
-			statusBar.setProgressTitle("classifying ontology");
-			OREManager.getInstance().getReasoner().classify();
-
-			return null;
-		}
-
-		@Override
-		public void done() {
-			wizard.getDialog().setCursor(null);
-			statusBar.showProgress(false);
-			statusBar.setProgressTitle("");
-		}
-
-	}
-    
-    
 }

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/KnowledgeSourcePanelDescriptor.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -20,7 +20,6 @@
 
 package org.dllearner.tools.ore.ui.wizard.descriptors;
 
-import java.awt.Cursor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -34,6 +33,7 @@
 
 import org.dllearner.tools.ore.OREManager;
 import org.dllearner.tools.ore.RecentManager;
+import org.dllearner.tools.ore.TaskManager;
 import org.dllearner.tools.ore.ui.ExtractFromSparqlDialog;
 import org.dllearner.tools.ore.ui.LinkLabel;
 import org.dllearner.tools.ore.ui.StatusBar;
@@ -106,7 +106,7 @@
     public void loadOntology(URI uri){
     	OREManager.getInstance().setCurrentKnowledgeSource(uri);
     	currentURI = uri;
-    	
+    	TaskManager.getInstance().setTaskStarted("Loading ontology");
     	new OntologyLoadingTask(getWizard().getStatusBar()).execute();
     	
     }
@@ -172,10 +172,11 @@
 	}
 	
 	private void handleOpenFromRecent(URI uri){
-		currentURI = uri;
-		OREManager.getInstance().setCurrentKnowledgeSource(
-				uri);
-		new OntologyLoadingTask(getWizard().getStatusBar()).execute();
+//		currentURI = uri;
+//		OREManager.getInstance().setCurrentKnowledgeSource(
+//				uri);
+//		new OntologyLoadingTask(getWizard().getStatusBar()).execute();
+		loadOntology(uri);
 	}
     
     private void updateMetrics(){
@@ -199,9 +200,7 @@
 		@Override
 		public Void doInBackground() {
 			getWizard().setNextFinishButtonEnabled(false);
-			getWizard().getDialog().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-			statusBar.showProgress(true);
-			statusBar.setProgressTitle("Loading ontology");
+			
 			try{
 	        	oreMan.initPelletReasoner();
 	        	RecentManager.getInstance().addURI(currentURI);
@@ -261,9 +260,7 @@
 		@Override
 		public void done() {
 			if(!isCancelled()){
-				statusBar.showProgress(false);
-				statusBar.setProgressTitle("Done");
-				getWizard().getDialog().setCursor(null);
+				TaskManager.getInstance().setTaskFinished();
 				getWizard().setNextFinishButtonEnabled(true);
 				updateMetrics();
 			}

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/LearningPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/LearningPanelDescriptor.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/LearningPanelDescriptor.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -20,7 +20,6 @@
 
 package org.dllearner.tools.ore.ui.wizard.descriptors;
 
-import java.awt.Cursor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.List;
@@ -39,6 +38,7 @@
 import org.dllearner.learningproblems.EvaluatedDescriptionClass;
 import org.dllearner.tools.ore.OREManager;
 import org.dllearner.tools.ore.OREManagerListener;
+import org.dllearner.tools.ore.TaskManager;
 import org.dllearner.tools.ore.ui.wizard.WizardPanelDescriptor;
 import org.dllearner.tools.ore.ui.wizard.panels.LearningPanel;
 
@@ -122,6 +122,7 @@
 	 */
 	public void actionPerformed(ActionEvent event) {
 		if(event.getActionCommand().equals("Start")){
+			TaskManager.getInstance().setTaskStarted("Learning equivalent class expressions");
 			learnPanel.getStartButton().setEnabled(false);
 	        learnPanel.getStopButton().setEnabled(true);
 	        OREManager.getInstance().setNoisePercentage(learnPanel.getOptionsPanel().getMinAccuracy());
@@ -139,7 +140,7 @@
 	        timer.cancel();
 			learnPanel.getStartButton().setEnabled(true);
 			getWizard().getStatusBar().showProgress(false);
-			getWizard().getStatusBar().setProgressTitle("learning stopped");
+			getWizard().getStatusBar().setProgressTitle("Learning stopped");
 	        
 		}
 		
@@ -199,9 +200,7 @@
 		@Override
 		public List<? extends EvaluatedDescription> doInBackground() {
 			learnPanel.getResultTable().clear();
-			getWizard().getDialog().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-			getWizard().getStatusBar().showProgress(true);
-			getWizard().getStatusBar().setProgressTitle("Learning equivalent class expressions");
+			
 
 			la = OREManager.getInstance().getLa();
 			timer = new Timer();
@@ -240,6 +239,7 @@
 			learnPanel.getStartButton().setEnabled(true);
 			learnPanel.getStopButton().setEnabled(false);
 			updateList(result);
+			TaskManager.getInstance().setTaskFinished();
 
 		}
 

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java	2009-09-13 15:41:13 UTC (rev 1844)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/panels/UnsatisfiableExplanationPanel.java	2009-09-14 09:59:30 UTC (rev 1845)
@@ -16,6 +16,7 @@
 import javax.swing.Box;
 import javax.swing.ButtonGroup;
 import javax.swing.JComponent;
+import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
@@ -120,9 +121,9 @@
 		explanationsScrollPane = new JScrollPane(pan);
 //		explanationsScrollPane.setPreferredSize(minimumSize);
 		explanationsScrollPane.setBorder(BorderFactory.createLineBorder(Color.LIGHT_GRAY));
-		explanationsScrollPane.getViewport().setOpaque(true);
+		explanationsScrollPane.getViewport().setOpaque(false);
 		explanationsScrollPane.getViewport().setBackground(null);
-		explanationsScrollPane.setOpaque(true);
+		explanationsScrollPane.setOpaque(false);
 			
 		regularButton = new JRadioButton("Show regular explanations", true);
 		regularButton.setActionCommand("regular");
@@ -262,4 +263,27 @@
 	public UnsatisfiableClassesTable getUnsatTable(){
 		return unsatClassesTable;
 	}
+	
+	public static void main(String[] args){
+		JFrame frame = new JFrame();
+		JPanel panel = new JPanel();
+		panel.setLayout(new BorderLayout());
+		JSplitPane pane1 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+		pane1.setDividerLocation(200);
+		JSplitPane pane2 = new JSplitPane(JSplitPane.VERTICAL_SPLIT);
+		pane2.setDividerLocation(200);
+		JSplitPane pane3 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
+		pane1.setLeftComponent(new JPanel());
+		pane1.setRightComponent(pane2);
+		pane2.setTopComponent(new JPanel());
+		pane2.setBottomComponent(pane3);
+		pane3.setLeftComponent(new JPanel());
+		pane3.setRightComponent(new JPanel());
+		panel.add(pane1);
+		frame.add(panel);
+		frame.setSize(400, 400);
+		frame.setVisible(true);
+		
+		
+	}
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.