cishell-svn

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

[<bh...@us...>]

Revision: 234
          http://svn.sourceforge.net/cishell/?rev=234&view=rev
Author:   bh2
Date:     2006-10-02 07:10:08 -0700 (Mon, 02 Oct 2006)

Log Message:
-----------
Fixed GUIBuilderService so that a show* method that was run within the GUI thread 
properly created/used a non-null Shell

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.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	2006-09-30 17:44:55 UTC (rev 233)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java	2006-10-02 14:10:08 UTC (rev 234)
@@ -50,6 +50,7 @@
         }};
         
     private Display display;
+    private Shell lastShell;
         
     
     public SWTGuiBuilderService(Display display) {
@@ -97,8 +98,17 @@
         guiRun(new Runnable() {
             public void run() {
                 returner.returnValue = display.getActiveShell();
+                
+                if (returner.returnValue == null) {
+                    if (lastShell != null) {
+                        returner.returnValue = lastShell;
+                    } else {
+                        returner.returnValue = new Shell();
+                    }
+                }
             }});
         
+        lastShell = (Shell) returner.returnValue;
         return (Shell) returner.returnValue;
     }
 


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

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

[<bh...@us...>]

Revision: 239
          http://svn.sourceforge.net/cishell/?rev=239&view=rev
Author:   bh2
Date:     2006-10-02 09:15:44 -0700 (Mon, 02 Oct 2006)

Log Message:
-----------
Better error checking of the MetaTypeProvider in the new GUIBuilder 

Modified Paths:
--------------
    trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.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	2006-10-02 16:15:00 UTC (rev 238)
+++ trunk/clients/gui/org.cishell.reference.gui.guibuilder.swt/src/org/cishell/reference/gui/guibuilder/swt/SWTGuiBuilderService.java	2006-10-02 16:15:44 UTC (rev 239)
@@ -59,10 +59,22 @@
 
     
     public GUI createGUI(String id, MetaTypeProvider parameters) {
-        GUICreator creator = new GUICreator(id, parameters);
-        display.syncExec(creator);
+        boolean validParams = true;
         
-        return creator.gui;
+        try {
+            validParams = parameters.getObjectClassDefinition(id, null) != null;
+        } catch (IllegalArgumentException e) {
+            validParams = false;
+        }
+        
+        if (validParams) {
+            GUICreator creator = new GUICreator(id, parameters);
+            display.syncExec(creator);
+            
+            return creator.gui;
+        } else {
+            return NULL_GUI;
+        }
     }
     
     private class GUICreator implements Runnable {
@@ -77,7 +89,7 @@
         
         public void run() {
             try {
-                Shell activeShell = display.getActiveShell();
+                Shell activeShell = getActiveShell();
                 
                 Shell shell = new Shell(activeShell, SWT.DIALOG_TRIM | SWT.RESIZE);
                 if (activeShell != null) {


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