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

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

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

Log Message:
-----------
fixed bug
started integrating help buttons on panels

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/ExtractFromSparqlDialog.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/LearningOptionsPanel.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/ManchesterSyntaxRenderer.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/ManchesterSyntaxTableCellRenderer.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/MultiLineTableCellRenderer.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTable.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTableModel.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/UnsatisfiableClassesTable.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/item/MoveToClassFromMenuItem.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java

Added Paths:
-----------
    trunk/src/dl-learner/org/dllearner/tools/ore/DeleteCross.gif
    trunk/src/dl-learner/org/dllearner/tools/ore/Help16.gif
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/Help-16x16.png
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/Help-24x24.png
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/HelpablePanel.java

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


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

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


Property changes on: trunk/src/dl-learner/org/dllearner/tools/ore/Help16.gif
___________________________________________________________________
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-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/RootFinder.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -55,6 +55,11 @@
 import org.semanticweb.owl.model.OWLQuantifiedRestriction;
 import org.semanticweb.owl.model.RemoveAxiom;
 
+import uk.ac.manchester.cs.owl.modularity.ModuleType;
+
+import com.clarkparsia.modularity.ModularityUtils;
+import com.clarkparsia.owlapi.OntologyUtils;
+
 public class RootFinder implements OWLDescriptionVisitor, OREManagerListener, OWLOntologyChangeListener, RepairManagerListener{
 
 	private OWLOntologyManager manager;
@@ -187,7 +192,7 @@
 	}
 	
 	private void pruneRoots() {
-
+System.out.println("Pruning root classes");
 		try {
 			Set<OWLClass> roots = new HashSet<OWLClass>(rootClasses);
 			List<OWLOntologyChange> appliedChanges = new ArrayList<OWLOntologyChange>();
@@ -214,8 +219,11 @@
 				appliedChanges.add(add);
 			}
 			OWLReasoner checker = reasonerFactory.createReasoner(manager);
-			checker.loadOntologies(Collections.singleton(ontology));
+//			checker.loadOntologies(Collections.singleton(ontology));
 			for (OWLClass root : new ArrayList<OWLClass>(roots)) {
+				checker.clearOntologies();
+				checker.loadOntologies(Collections.singleton(OntologyUtils.getOntologyFromAxioms(ModularityUtils.extractModule
+						(ontology, root.getSignature(), ModuleType.TOP_OF_BOT))));
 				if (!potentialRoots.contains(root) && checker.isSatisfiable(root)) {
 					rootClasses.remove(root);
 				}

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-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/laconic/LaconicExplanationGenerator.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -218,7 +218,7 @@
 		return laconic;
 	}
     
-    private Set<Explanation> retrieveAxioms(Set<Explanation> explanations) {
+    public Set<Explanation> retrieveAxioms(Set<Explanation> explanations) {
 
 		Map<OWLAxiom, Set<OWLAxiom>> sourceAxioms2OPlus = new HashMap<OWLAxiom, Set<OWLAxiom>>();
 
@@ -335,20 +335,9 @@
     
     public Set<OWLAxiom> getRemainingAxioms(OWLAxiom source, OWLAxiom part){
     	Set<OWLAxiom> parts = computeOPlus(Collections.singleton(source));
-//    	for(OWLAxiom ax : parts){
-//    		System.out.println("Part: " + ax);
-//    		for(OWLAxiom a : oPlus.getAxiomsMap().get(ax)){
-//    			System.out.println("has source: " + a);
-//    		}
-//    		
-//    	}
-    	
-    	for(OWLAxiom par : parts){
-//    		System.out.println("has Part: " + par);
-    	}
+
     	for(OWLAxiom ax :  oPlus.getAxiomsMap().get(part)){
 			parts.remove(ax);
-//			System.out.println("Removing: " + ax);
 		}
     	Set<OWLAxiom> remove = new HashSet<OWLAxiom>();
     	for(OWLAxiom ax : parts){
@@ -366,78 +355,14 @@
     	
     }
     
-    private Set<OWLAxiom> rebuildAxioms(Set<OWLAxiom> axioms){
-		Map<OWLAxiom, Set<OWLAxiom>> sourceAxioms2OPlus = new HashMap<OWLAxiom, Set<OWLAxiom>>();
-	
-		for (OWLAxiom ax : axioms) {
-			if (ontology.containsAxiom(ax)) {
-				sourceAxioms2OPlus.put(ax, computeOPlus(Collections
-						.singleton(ax)));
-			}
-		}
-
-    	Map<OWLClass, Map<OWLAxiom, Set<OWLSubClassAxiom>>> lhs2SubClassAxiom = new HashMap<OWLClass, Map<OWLAxiom, Set<OWLSubClassAxiom>>>();
-		Set<OWLAxiom> reconstituedAxioms = new HashSet<OWLAxiom>();
-		for (OWLAxiom laconicAx : axioms) {System.out.println("\n" + laconicAx);
-			
-			
-			if (laconicAx instanceof OWLSubClassAxiom) {
-				OWLSubClassAxiom subAx = (OWLSubClassAxiom) laconicAx;
-				if (subAx.getSubClass().isAnonymous()) {
-					reconstituedAxioms.add(subAx);
-				} else {
-					Map<OWLAxiom, Set<OWLSubClassAxiom>> source2AxiomMap = lhs2SubClassAxiom.get(subAx.getSubClass().asOWLClass());
-					if (source2AxiomMap == null) {
-						source2AxiomMap = new HashMap<OWLAxiom, Set<OWLSubClassAxiom>>();
-						lhs2SubClassAxiom.put(subAx.getSubClass().asOWLClass(), source2AxiomMap);
-					}
-
-					for (OWLAxiom sourceAxiom : sourceAxioms2OPlus.keySet()) {
-						if ((sourceAxioms2OPlus.get(sourceAxiom)).contains(subAx)) {
-							Set<OWLSubClassAxiom> subClassAxioms = source2AxiomMap.get(sourceAxiom);
-							if (subClassAxioms == null) {
-								subClassAxioms = new HashSet<OWLSubClassAxiom>();
-								source2AxiomMap.put(sourceAxiom, subClassAxioms);
-							}
-							subClassAxioms.add(subAx);
-						}
-					}
-				}
-			} else {
-				reconstituedAxioms.add(laconicAx);
-			}
-		}
-		Set<OWLAxiom> consumedAxioms = new HashSet<OWLAxiom>();
-		for (OWLClass lhs : lhs2SubClassAxiom.keySet()) {
-			Map<OWLAxiom, Set<OWLSubClassAxiom>> source2SubClassAxiom = lhs2SubClassAxiom.get(lhs);
-			for (OWLAxiom source : source2SubClassAxiom.keySet()) {
-				Set<OWLDescription> rightHandSides = new HashSet<OWLDescription>();
-				for (OWLSubClassAxiom sub : source2SubClassAxiom.get(source)) {
-					if (!consumedAxioms.contains(sub)) {
-						rightHandSides.add(sub.getSuperClass());
-						consumedAxioms.add(sub);
-					}
-				}
-
-				if (rightHandSides.size() == 1)
-					reconstituedAxioms.add(manager.getOWLDataFactory().getOWLSubClassAxiom((OWLDescription) lhs,((OWLDescription) rightHandSides.iterator().next())));
-				else if (rightHandSides.size() > 1) {
-					org.semanticweb.owl.model.OWLObjectIntersectionOf conjunction = manager.getOWLDataFactory().getOWLObjectIntersectionOf(rightHandSides);
-					reconstituedAxioms.add(manager.getOWLDataFactory().getOWLSubClassAxiom((OWLDescription) lhs,conjunction));
-				}
-			}
-		}
-		return reconstituedAxioms;
-    }
-    
     public static void main(String[] args) throws OWLOntologyCreationException, ExplanationException, OWLOntologyChangeException{
-    	String baseURI = "http://protege.stanford.edu/plugins/owl/owl-library/koala.owl";
+//    	String baseURI = "http://protege.stanford.edu/plugins/owl/owl-library/koala.owl";
     	OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
     	OWLOntology ontology = manager.loadOntologyFromPhysicalURI(URI.create("file:examples/ore/koala.owl"));
     	OWLDataFactory factory = manager.getOWLDataFactory();
     	LaconicExplanationGenerator expGen = new LaconicExplanationGenerator(manager, new PelletReasonerFactory(), Collections.singleton(ontology));
-    	OWLClass koalaWithPhD = factory.getOWLClass(URI.create(baseURI + "#KoalaWithPhD"));
-    	OWLClass koala = factory.getOWLClass(URI.create(baseURI + "#Koala"));
+//    	OWLClass koalaWithPhD = factory.getOWLClass(URI.create(baseURI + "#KoalaWithPhD"));
+//    	OWLClass koala = factory.getOWLClass(URI.create(baseURI + "#Koala"));
     	
 //    	System.out.println(expGen.getExplanations(factory.getOWLSubClassAxiom(koalaWithPhD, factory.getOWLNothing()), 1));
 //    	OWLAxiom laconicAx = factory.getOWLSubClassAxiom(koalaWithPhD, koala);

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-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExplanationTable.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -11,12 +11,15 @@
 import java.util.List;
 
 import javax.swing.AbstractCellEditor;
+import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JButton;
+import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.UIManager;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
+import javax.swing.table.DefaultTableCellRenderer;
 import javax.swing.table.JTableHeader;
 import javax.swing.table.TableCellEditor;
 import javax.swing.table.TableCellRenderer;
@@ -70,6 +73,16 @@
 		getColumn(3).setMaxWidth(60);
 		getColumn(4).setMaxWidth(30);
 		getColumn(5).setMaxWidth(30);
+		getColumn(4).setHeaderRenderer(new TableCellRenderer() {
+			
+			@Override
+			public Component getTableCellRendererComponent(JTable arg0, Object value,
+					boolean arg2, boolean arg3, int arg4, int arg5) {
+				JButton b = new JButton((Icon)value);
+				return b;
+			}
+		});
+		getColumn(4).setHeaderValue(new ImageIcon("src/dl-learner/org/dllearner/tools/ore/DeleteCross.gif"));
 		getSelectionModel().addListSelectionListener(
 				new ListSelectionListener() {
 
@@ -217,7 +230,25 @@
 			fireEditingStopped();
 		}
 	}
+	
+	class IconRenderer extends DefaultTableCellRenderer {
+		/**
+		 * 
+		 */
+		private static final long serialVersionUID = -1729370486474583609L;
 
+		public Component getTableCellRendererComponent(JTable table,
+				Object obj, boolean isSelected, boolean hasFocus, int row,
+				int column) {
+
+			setIcon((Icon) obj);
+
+			setBorder(UIManager.getBorder("TableHeader.cellBorder"));
+			setHorizontalAlignment(JLabel.CENTER);
+			return this;
+		}
+	}
+
 	@Override
 	public void repairPlanExecuted(List<OWLOntologyChange> changes) {
 		repaint();	

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ExtractFromSparqlDialog.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -10,6 +10,8 @@
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
@@ -143,24 +145,26 @@
 
 		JPanel endPointHolderPanel = new JPanel();
 		endPointHolderPanel.setLayout(new GridLayout(0, 1));
-		endPointHolderPanel.setBorder(new TitledBorder("SPARQL endpoint"));
+//		endPointHolderPanel.setBorder(new TitledBorder("SPARQL endpoint"));
 		comboBox = new JComboBox();
 		comboBox.setEditable(true);
 		comboBox.setActionCommand("endpoints");
 		comboBox.addActionListener(this);
-		
 		((JTextComponent)comboBox.getEditor().getEditorComponent()).getDocument().addDocumentListener(this);
 		AutoCompleteDecorator.decorate(this.comboBox);
+		
 		endPointHolderPanel.add(new JLabel("URL"));
 		endPointHolderPanel.add(comboBox);
 		defaultGraphField = new JTextField();
 		endPointHolderPanel.add(new JLabel("Default graph URI (optional)"));
 		endPointHolderPanel.add(defaultGraphField);
-		panel.add(endPointHolderPanel, c);
+		HelpablePanel endPointHelpPanel = new HelpablePanel(endPointHolderPanel);
+		endPointHelpPanel.setBorder(new TitledBorder("SPARQL endpoint"));
+		panel.add(endPointHelpPanel, c);
 
 		JPanel classHolderPanel = new JPanel();
 		classHolderPanel.setLayout(new GridLayout(0, 1));
-		classHolderPanel.setBorder(new TitledBorder("Class to investigate"));
+//		classHolderPanel.setBorder(new TitledBorder("Class to investigate"));
 		asLabelButton = new JRadioButton("label");
 		asURLButton = new JRadioButton("URI");
 		asURLButton.setSelected(true);
@@ -171,12 +175,14 @@
 		buttonPanel.add(new JLabel("input type:"));
 		buttonPanel.add(asURLButton);
 		buttonPanel.add(asLabelButton);
-
+		
 		classHolderPanel.add(buttonPanel);
 		classField = new JTextField();
 		classField.getDocument().addDocumentListener(this);
 		classHolderPanel.add(classField);
-		panel.add(classHolderPanel, c);
+		HelpablePanel classHelpPanel = new HelpablePanel(classHolderPanel);
+		classHelpPanel.setBorder(new TitledBorder("Class to investigate"));
+		panel.add(classHelpPanel, c);
 
 		
 
@@ -204,6 +210,18 @@
 		optionsButton.setHorizontalAlignment(JButton.LEADING); // optional
 		optionsButton.setBorderPainted(false);
 		optionsButton.setContentAreaFilled(false);
+		optionsButton.addMouseListener(new MouseAdapter() {
+			public void mouseEntered(MouseEvent e) {
+				optionsButton.setBorderPainted(true);
+				optionsButton.setContentAreaFilled(true);
+			};
+			@Override
+			public void mouseExited(MouseEvent e) {
+				optionsButton.setBorderPainted(false);
+				optionsButton.setContentAreaFilled(false);
+			}
+		
+		});
 		c.fill = GridBagConstraints.NONE;
 		c.anchor = GridBagConstraints.WEST;
 		panel.add(optionsButton, c);

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-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/GraphicalCoveragePanel.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -31,8 +31,6 @@
 import java.util.Set;
 import java.util.Vector;
 
-import javax.swing.JPanel;
-
 import org.dllearner.core.EvaluatedDescription;
 import org.dllearner.core.owl.Individual;
 import org.dllearner.learningproblems.EvaluatedDescriptionClass;
@@ -46,7 +44,7 @@
  * @author Christian Koetteritzsch
  * 
  */
-public class GraphicalCoveragePanel extends JPanel implements MouseMotionListener{
+public class GraphicalCoveragePanel extends HelpablePanel implements MouseMotionListener{
 
 	private static final long serialVersionUID = 855436961912515267L;
 	private static final int HEIGHT = 200;

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


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

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


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

Added: trunk/src/dl-learner/org/dllearner/tools/ore/ui/HelpablePanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/HelpablePanel.java	                        (rev 0)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/HelpablePanel.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -0,0 +1,113 @@
+package org.dllearner.tools.ore.ui;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.GridLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.ImageIcon;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.border.TitledBorder;
+import javax.swing.text.JTextComponent;
+
+import org.jdesktop.swingx.autocomplete.AutoCompleteDecorator;
+
+
+public class HelpablePanel extends JPanel {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 2511480671795808029L;
+	private JButton helpButton;
+	
+	private String helpText = "TODO";
+
+	
+	public HelpablePanel(){
+		setLayout(new BorderLayout());
+		helpButton = new JButton(new ImageIcon(this.getClass().getResource("Help-16x16.png")));
+		helpButton.setBorderPainted(false);
+		helpButton.setContentAreaFilled(false);
+//		helpButton.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
+		helpButton.setPreferredSize(new Dimension(16, 16));
+		helpButton.addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseEntered(MouseEvent e) {
+				helpButton.setBorderPainted(true);
+				helpButton.setContentAreaFilled(true);
+			}
+			
+			@Override
+			public void mouseExited(MouseEvent e) {
+				helpButton.setBorderPainted(false);
+				helpButton.setContentAreaFilled(false);
+			}
+			
+		});
+		helpButton.addActionListener(new ActionListener() {
+			
+			@Override
+			public void actionPerformed(ActionEvent e) {
+				JOptionPane.showMessageDialog(null,
+					    helpText,
+					    "",
+					    JOptionPane.PLAIN_MESSAGE);
+
+
+				
+			}
+		});
+		JPanel holderPanel = new JPanel();
+		holderPanel.setLayout(new BorderLayout());
+		holderPanel.add(helpButton, BorderLayout.NORTH);
+		add(holderPanel, BorderLayout.EAST);
+	}
+	
+	public HelpablePanel(JPanel content){
+		this();
+		add(content, BorderLayout.CENTER);
+	}
+	
+	public void setHelpText(String helpText){
+		this.helpText = helpText;
+	}
+	
+	public static void main(String[] args){
+		JFrame frame = new JFrame();
+		
+		JPanel endPointHolderPanel = new JPanel();
+		endPointHolderPanel.setLayout(new GridLayout(0, 1));
+//		endPointHolderPanel.setBorder(new TitledBorder("SPARQL endpoint"));
+		JComboBox comboBox = new JComboBox();
+		comboBox.setEditable(true);
+		comboBox.setActionCommand("endpoints");
+		
+		
+		endPointHolderPanel.add(new JLabel("URL"));
+		endPointHolderPanel.add(comboBox);
+		JTextField defaultGraphField = new JTextField();
+		endPointHolderPanel.add(new JLabel("Default graph URI (optional)"));
+		endPointHolderPanel.add(defaultGraphField);
+		HelpablePanel endPointHelpPanel = new HelpablePanel(endPointHolderPanel);
+		endPointHelpPanel.setBorder(new TitledBorder("SPARQL endpoint"));
+		
+		
+	
+		
+		frame.add(endPointHelpPanel);
+		frame.setSize(600, 600);
+		frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
+		frame.setVisible(true);
+	}
+	
+}

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/LearningOptionsPanel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/LearningOptionsPanel.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/LearningOptionsPanel.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -32,7 +32,7 @@
  * @author Christian Koetteritzsch
  *
  */
-public class LearningOptionsPanel extends JPanel {
+public class LearningOptionsPanel extends HelpablePanel {
 
 	
 	private static final long serialVersionUID = 2190682281812478244L;
@@ -57,8 +57,9 @@
 	 * Constructor for the Option Panel. 
 	 */
 	public LearningOptionsPanel() {
-	
-		setLayout(new BorderLayout());
+		super();
+		JPanel holderPanel = new JPanel();
+		holderPanel.setLayout(new BorderLayout());
 		labelPanel = new JPanel();
 		labelPanel.setLayout(new GridLayout(0, 1));
 		sliderPanel = new JPanel();
@@ -121,9 +122,10 @@
 		learnTypePanel.add(equivalentClassButton);
 		learnTypePanel.add(superClassButton);
 		
-		add(BorderLayout.NORTH, learnTypePanel);
-		add(BorderLayout.WEST, labelPanel);
-		add(BorderLayout.CENTER, sliderPanel);
+		holderPanel.add(BorderLayout.NORTH, learnTypePanel);
+		holderPanel.add(BorderLayout.WEST, labelPanel);
+		holderPanel.add(BorderLayout.CENTER, sliderPanel);
+		add(holderPanel, BorderLayout.CENTER);
 	}
 	
 	/**

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ManchesterSyntaxRenderer.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ManchesterSyntaxRenderer.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ManchesterSyntaxRenderer.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -90,10 +90,12 @@
 		while(st.hasMoreTokens()){
 			token = st.nextToken();
 			boolean unsatClass = false;
-			for(OWLClass cl : ExplanationManager.getInstance(OREManager.getInstance()).getUnsatisfiableClasses()){
-				if(cl.toString().equals(token)){
-					unsatClass = true;
-					break;
+			if(OREManager.getInstance().consistentOntology()){
+				for(OWLClass cl : ExplanationManager.getInstance(OREManager.getInstance()).getUnsatisfiableClasses()){
+					if(cl.toString().equals(token)){
+						unsatClass = true;
+						break;
+					}
 				}
 			}
 			String color = "black";

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ManchesterSyntaxTableCellRenderer.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ManchesterSyntaxTableCellRenderer.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ManchesterSyntaxTableCellRenderer.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -14,22 +14,23 @@
 import org.semanticweb.owl.model.OWLIndividual;
 import org.semanticweb.owl.model.OWLObject;
 
+import uk.ac.manchester.cs.owl.mansyntaxrenderer.ManchesterOWLSyntaxObjectRenderer;
+
 import com.clarkparsia.explanation.io.manchester.Keyword;
-import com.clarkparsia.explanation.io.manchester.ManchesterSyntaxObjectRenderer;
 import com.clarkparsia.explanation.io.manchester.TextBlockWriter;
 
 public class ManchesterSyntaxTableCellRenderer extends DefaultTableCellRenderer {
 
 	private StringWriter buffer;
 	private TextBlockWriter writer;
-	private ManchesterSyntaxObjectRenderer renderer;
+	private ManchesterOWLSyntaxObjectRenderer renderer;
 	
 	public ManchesterSyntaxTableCellRenderer(){
 		buffer = new StringWriter();
 		writer = new TextBlockWriter(buffer);
-		renderer = new ManchesterSyntaxObjectRenderer(writer);
-		renderer.setWrapLines( false );
-		renderer.setSmartIndent( true );
+		renderer = new ManchesterOWLSyntaxObjectRenderer(writer);
+//		renderer.setWrapLines( false );
+//		renderer.setSmartIndent( true );
 	}
 	
 	@Override

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/MultiLineTableCellRenderer.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/MultiLineTableCellRenderer.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/MultiLineTableCellRenderer.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -41,8 +41,7 @@
 
 		private StyledDocument doc;
 		Style style;
-        public MultiLineTableCellRenderer()
-        {
+        public MultiLineTableCellRenderer() {
             super();
 
             

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTable.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTable.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -15,6 +15,8 @@
 	 * 
 	 */
 	private static final long serialVersionUID = -497294373160119210L;
+	
+	private EvaluatedDescriptionClass old = null;
 
 	public ResultTable(){
 		setBackground(Color.WHITE);
@@ -42,12 +44,25 @@
 				
 	}
 	
+	
+	
 	public void clear(){
 		((ResultTableModel)getModel()).clear();
 	}
 	
 	public void addResults(List<EvaluatedDescriptionClass> resultList){
+		
+		if(getSelectedRow() >= 0){
+			old = getSelectedValue();
+		}
 		((ResultTableModel)getModel()).addResults(resultList);
+		if(old != null){
+			int newRowIndex = ((ResultTableModel)getModel()).getSelectionIndex(old);
+			if(newRowIndex >= 0){
+				getSelectionModel().setSelectionInterval(newRowIndex, newRowIndex);
+			}
+			
+		}
 	}
 	
 	public EvaluatedDescriptionClass getSelectedValue(){	

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTableModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTableModel.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/ResultTableModel.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -74,11 +74,17 @@
 	public void addResults(List<EvaluatedDescriptionClass> resultList){
 		this.resultList.clear();
 		this.resultList.addAll(resultList);
-		fireTableDataChanged();
+		
+		
+		fireTableRowsUpdated(0, this.resultList.size());
 	}
 	
 	public EvaluatedDescriptionClass getSelectedValue(int rowIndex){
 		return resultList.get(rowIndex);
 	}
+	
+	public int getSelectionIndex(EvaluatedDescriptionClass e){
+		return resultList.indexOf(e);
+	}
 
 }

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-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/StatusBar.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -10,6 +10,8 @@
 import java.awt.SystemColor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.awt.geom.Ellipse2D;
 import java.util.Set;
 
@@ -140,7 +142,6 @@
 
 	@Override
 	public void foundExplanation(Set<OWLAxiom> explanation) {
-		System.out.println(explanation);
 		
 	}
 
@@ -333,15 +334,23 @@
 		setHorizontalAlignment(JButton.LEADING); // optional
 		setBorderPainted(false);
 		setContentAreaFilled(false);
+		
+		addMouseListener(new MouseAdapter() {
+			@Override
+			public void mouseEntered(MouseEvent arg0) {
+				setBorderPainted(true);
+				setContentAreaFilled(true);
+			}
+			
+			@Override
+			public void mouseExited(MouseEvent e) {
+				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/UnsatisfiableClassesTable.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/UnsatisfiableClassesTable.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/UnsatisfiableClassesTable.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -8,7 +8,6 @@
 import org.dllearner.tools.ore.ExplanationManager;
 import org.dllearner.tools.ore.OREManager;
 import org.jdesktop.swingx.JXTable;
-import org.jdesktop.swingx.decorator.HighlighterFactory;
 import org.semanticweb.owl.model.OWLClass;
 
 public class UnsatisfiableClassesTable extends JXTable {
@@ -26,7 +25,7 @@
 		setTableHeader(null);
 		setGridColor(Color.LIGHT_GRAY);
 		getColumn(0).setMaxWidth(20);
-		setRowHeight(getRowHeight() + 5);
+		setRowHeight(getRowHeight() + 2);
 		getColumn(0).setCellRenderer(new UnsatClassesTableCellRenderer(expMan));
 		
 //		setAutoResizeMode(JTable.AUTO_RESIZE_OFF);

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/item/MoveToClassFromMenuItem.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/item/MoveToClassFromMenuItem.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/item/MoveToClassFromMenuItem.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -7,6 +7,10 @@
 
 public class MoveToClassFromMenuItem extends JMenuItem {
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3577226441483461020L;
 	private Description source;
 	private Description destination;
 	

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-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/WizardController.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -290,7 +290,7 @@
     
     private int showInconsistentOntologyWarning(){
 		String infoString = "<html>Can not do reasoning with inconsistent ontologies, " +
-				"since everything is equivalent to OWL:nothing" +
+				"since everything is equivalent to OWL:Nothing" +
 				"<UL>" +
 				"<LI>Press 'Yes' and try to repair the ontology" +
 				"<LI>Press 'No' and choose another ontology or exit" +

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java	2009-09-25 11:13:32 UTC (rev 1865)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/ClassChoosePanelDescriptor.java	2009-09-28 07:30:22 UTC (rev 1866)
@@ -149,60 +149,8 @@
 			}
 		}
 		classChoosePanel.getClassesTable().addClasses(classes);
-//		classChoosePanel.getClassesTable().clear();
-//		TaskManager.getInstance().setTaskStarted("Retrieving atomic classes...");
-//		new ClassRetrievingTask(minInstanceCount).execute();
 	}
-	
-//	/**
-//     * Inner class to get all atomic classes in a background thread.
-//     * @author Lorenz Buehmann
-//     *
-//     */
-//    class ClassRetrievingTask extends SwingWorker<Set<NamedClass>, NamedClass> {
-//    	
-//    	private int minInstanceCount;
-//    	
-//    	public ClassRetrievingTask(int minInstanceCount){
-//    		this.minInstanceCount = minInstanceCount;
-//    	}
-//
-//		@Override
-//		public Set<NamedClass> doInBackground() {
-//			OREManager.getInstance().makeOWAToCWA();
-//			Set<NamedClass> classes = new TreeSet<NamedClass>(OREManager.getInstance().getReasoner().getNamedClasses());
-//			classes.remove(new NamedClass("http://www.w3.org/2002/07/owl#Thing"));
-//			Iterator<NamedClass> iter = classes.iterator();
-//			while(iter.hasNext()){
-//				NamedClass nc = iter.next();
-//				int instanceCount = OREManager.getInstance().getReasoner().getIndividuals(nc).size();
-//				if(instanceCount < minInstanceCount){
-//					iter.remove();
-//				}
-//			}
-//			
-//			return classes;
-//		}
-//
-//		@Override
-//		public void done() {
-//			Set<NamedClass> classes = null;
-//			try {
-//				classes = get();
-//			} catch (InterruptedException e) {
-//				// TODO Auto-generated catch block
-//				e.printStackTrace();
-//			} catch (ExecutionException e) {
-//				// TODO Auto-generated catch block
-//				e.printStackTrace();
-//			}
-//			
-//			classChoosePanel.getClassesTable().addClasses(classes);
-//			TaskManager.getInstance().setTaskFinished();
-//		}
-//
-//	}
-    
+  
     /**
      * Inner class to get all atomic classes in a background thread.
      * @author Lorenz Buehmann
@@ -213,6 +161,7 @@
 
 		@Override
 		public Void doInBackground() {
+			instanceCountToClasses.clear();
 			OREManager.getInstance().makeOWAToCWA();
 			Set<NamedClass> classes = new TreeSet<NamedClass>(OREManager.getInstance().getReasoner().getNamedClasses());
 			classes.remove(new NamedClass("http://www.w3.org/2002/07/owl#Thing"));
@@ -237,10 +186,10 @@
 				
 				@Override
 				public void run() {
-					fillClassesList(1);				
+					fillClassesList(1);		
+					TaskManager.getInstance().setTaskFinished();
 				}
-			});		
-			TaskManager.getInstance().setTaskFinished();
+			});					
 		}
 	}
 }


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