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

[<hee...@us...>]

Revision: 1750
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1750&view=rev
Author:   heeroyuy
Date:     2009-05-14 06:33:31 +0000 (Thu, 14 May 2009)

Log Message:
-----------
-fixed bug that plugin shows loding instances... when ontology is inconsistent

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
    trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
    trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2009-05-10 13:33:52 UTC (rev 1749)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerModel.java	2009-05-14 06:33:31 UTC (rev 1750)
@@ -228,13 +228,14 @@
 			reasoner.isSatisfiable();
 			view.setIsInconsistent(false);
 			isReasonerSet = true;
-		} catch (ComponentInitException e) {
-			// TODO Auto-generated catch block
-			System.out.println("fehler!!!!!!!!!");	
-			e.printStackTrace();
+		}catch (ComponentInitException e) {
+			System.out.println("testen");
+			view.setIsInconsistent(true);
+			//e.printStackTrace();
 		} catch (InconsistentOntologyException incon) {
+			System.out.println("test");
 			view.setIsInconsistent(true);
-		}
+		} 
 	}
 	
 	/**

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java	2009-05-10 13:33:52 UTC (rev 1749)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/DLLearnerView.java	2009-05-14 06:33:31 UTC (rev 1750)
@@ -204,6 +204,9 @@
 		if(readThread.hasIndividuals()) {
 			run.setEnabled(true);
 		}
+		//if(labels.equals(currentConcept)) {
+		//model.getReasoner().setUpdated();
+		//}
 		labels = currentConcept;
 		run.setText("suggest " + label + " expression");
 		GridBagConstraints c = new GridBagConstraints();
@@ -238,13 +241,14 @@
 		c.weighty = 0.0;
 		c.gridwidth = 1;
 		addButtonPanel.add("North", accept);
-		//c.gridwidth = GridBagConstraints.REMAINDER;
 		learner.add(addButtonPanel, c);
 		
-		c.fill = GridBagConstraints.HORIZONTAL;
-		c.gridwidth = GridBagConstraints.REMAINDER;
+		c.fill = GridBagConstraints.BOTH;
+		c.weightx = 0.0;
+		c.weighty = 0.0;
 		c.gridx = 0;
 		c.gridy = 2;
+		hint.setPreferredSize(new Dimension(490, 60));
 		learner.add(hint, c);
 		
 		advancedPanel.add(advanced);
@@ -252,7 +256,6 @@
 		advanced.setIcon(icon);
 		advanced.setSelected(false);
 		c.fill = GridBagConstraints.NONE;
-		c.gridwidth = GridBagConstraints.RELATIVE;
 		c.gridx = 0;
 		c.weightx = 0.0;
 		c.weighty = 0.0;
@@ -261,8 +264,6 @@
 		
 		posPanel.setVisible(false);
 		c.fill = GridBagConstraints.BOTH;
-		c.gridwidth = GridBagConstraints.RELATIVE;
-		c.gridheight = GridBagConstraints.RELATIVE;
 		c.gridx = 0;
 		c.gridy = 4;
 		c.weightx = 0.0;
@@ -449,6 +450,10 @@
 		this.isInconsistent = isIncon;
 	}
 	
+	public boolean getIsInconsistent() {
+		return isInconsistent;
+	}
+	
 	/**
 	 * Adds Actionlistener to the run button.
 	 * @param a ActionListener

Modified: trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java	2009-05-10 13:33:52 UTC (rev 1749)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/ReadingOntologyThread.java	2009-05-14 06:33:31 UTC (rev 1750)
@@ -175,7 +175,7 @@
 			model.setReasoner();
 		}
 		reasoner = model.getReasoner();
-		isInconsistent = false;
+		isInconsistent = view.getIsInconsistent();
 		if(!isInconsistent) {
 			this.checkURI();
 			this.setPositiveConcept();


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