[CIShell-SVN] SF.net SVN: cishell:[1171] trunk/clients/gui/org.cishell.reference.gui. guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt

[<pat...@us...>]

Revision: 1171
          http://cishell.svn.sourceforge.net/cishell/?rev=1171&view=rev
Author:   pataphil
Date:     2010-11-18 17:15:36 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
* Hack NPE fix.

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java
    trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java

Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java	2010-11-17 23:23:34 UTC (rev 1170)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java	2010-11-18 17:15:36 UTC (rev 1171)
@@ -69,7 +69,7 @@
         
         if (validParams) {
             GUICreator creator = new GUICreator(id, parameters);
-            display.syncExec(creator);
+            this.display.syncExec(creator);
             
             return creator.gui;
         } else {
@@ -96,7 +96,7 @@
                     shell.setImage(activeShell.getImage());
                 }
                 
-                gui = new SWTGui(shell,SWT.NONE,id,parameters);
+                gui = new SWTGui(shell, SWT.NONE, id, parameters);
             } catch (IllegalArgumentException e) {}
         }
     }

Modified: trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java
===================================================================
--- trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java	2010-11-17 23:23:34 UTC (rev 1170)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/builder/components/LabelingComponent.java	2010-11-18 17:15:36 UTC (rev 1171)
@@ -158,11 +158,14 @@
 	public String validate() {
 		String valid = childComponent.validate();
 
-		// If valid is a string then the string is the error message.
-		if ((valid != null) && (valid.length() > 0)) {
-			label.setForeground(ERROR_COLOR);
-		} else {
-			label.setForeground(null);
+		// TODO: HACK: label may not have been created yet.
+		if (this.label != null) {
+			// If valid is a string then the string is the error message.
+			if ((valid != null) && (valid.length() > 0)) {
+				label.setForeground(ERROR_COLOR);
+			} else {
+				label.setForeground(null);
+			}
 		}
 
 		return valid;


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