Changeset 15863

Timestamp:

2008-06-04 19:37:54 (4 months ago)

Author:

ak19

Message:

Exit Client GLI (Gatherer.exit()) when user pressed cancel first time in the opening dialog or if the connection was refused, instead of a zillion error dialogs popping up because it tries to (but fails) to do more tasks.

Files:

• gli/trunk/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java

@@ -253 +253 @@
-        public void run()
-        {
+            boolean exit = false;
-            while (true) {
-                // If there are jobs on the queue, get the next in line and process it
@@ -266 +267 @@
-                    catch (RemoteGreenstoneServerActionCancelledException exception) {
-                        remote_greenstone_server_action.processed_successfully = false;
+                        exit = true;
+                    } 
+                    catch(java.net.ConnectException exception) {
+                        if(exception.getMessage().equals("Connection refused")) {
+                            exit = true;
+                        } else {
+                            DebugStream.printStackTrace(exception);
+                        }
+                        JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("RemoteGreenstoneServer.Error", exception.getMessage()), Dictionary.get("RemoteGreenstoneServer.Error_Title"), JOptionPane.ERROR_MESSAGE);
+                        remote_greenstone_server_action.processed_successfully = false;                 
-                    }
-                    catch (Exception exception) {
@@ -289 +300 @@
-                        catch (InterruptedException exception) { }
-                    }
+                }
+                
+                // stop the gazillion annoying error messages when the connection was simply
+                // refused or when the user pressed Cancel in the opening dialog, by exitting
+                // cleanly in one go.
+                if(exit == true) {
+                    Gatherer.exit();
-                }
-            }