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

[<jen...@us...>]

Revision: 2065
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2065&view=rev
Author:   jenslehmann
Date:     2010-02-18 13:05:44 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
fix for bug #2952828 (NullPointerException when using CELOE in GUI in GeoSkills)

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java
    trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelURL.java

Modified: trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java	2010-02-18 12:40:38 UTC (rev 2064)
+++ trunk/src/dl-learner/org/dllearner/algorithms/celoe/CELOE.java	2010-02-18 13:05:44 UTC (rev 2065)
@@ -293,7 +293,8 @@
 
 	@Override
 	public Description getCurrentlyBestDescription() {
-		return getCurrentlyBestEvaluatedDescription().getDescription();
+		EvaluatedDescription ed = getCurrentlyBestEvaluatedDescription();
+		return ed == null ? null : ed.getDescription();
 	}
 
 	@Override

Modified: trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelURL.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelURL.java	2010-02-18 12:40:38 UTC (rev 2064)
+++ trunk/src/dl-learner/org/dllearner/gui/widgets/WidgetPanelURL.java	2010-02-18 13:05:44 UTC (rev 2065)
@@ -139,9 +139,13 @@
 			}
 			comboBox.addActionListener(this);
 			// selecting index 0 causes incorrect class to load !
-//			comboBox.setSelectedIndex(0);
-			NamedClass valueNc = new NamedClass(value.toString());
-			comboBox.setSelectedItem(valueNc.toManchesterSyntaxString(baseURI, prefixes));
+			if(value == null) {
+				comboBox.setSelectedIndex(0);
+			} else {
+				NamedClass valueNc = new NamedClass(value.toString());
+				comboBox.setSelectedItem(valueNc.toManchesterSyntaxString(baseURI, prefixes));
+				
+			}
 			add(comboBox);
 		} else {
 			// text field for strings


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