AbstractMain and console refactoring

2 files changed, 3 insertions, 9 deletions

diff --git a/src/main/java/com/c2kernel/gui/Main.java b/src/main/java/com/c2kernel/gui/Main.java
index 5c8be98..627ad1a 100644
--- a/src/main/java/com/c2kernel/gui/Main.java
+++ b/src/main/java/com/c2kernel/gui/Main.java
@@ -47,7 +47,7 @@ public class Main extends StandardClient
         	        }

         	            

         	}

-        	Gateway.init(readC2KArgs(args), false);

+        	Gateway.init(readC2KArgs(args));

             Logger.initConsole("GUI");

             MainFrame client = new MainFrame();

             client.showLogin();

diff --git a/src/main/java/com/c2kernel/gui/MainFrame.java b/src/main/java/com/c2kernel/gui/MainFrame.java
index 1e9123f..4c2a835 100644
--- a/src/main/java/com/c2kernel/gui/MainFrame.java
+++ b/src/main/java/com/c2kernel/gui/MainFrame.java
@@ -28,6 +28,7 @@ import com.c2kernel.gui.tree.Node;
 import com.c2kernel.gui.tree.NodeContext;

 import com.c2kernel.lookup.DomainPath;

 import com.c2kernel.process.Gateway;

+import com.c2kernel.process.StandardClient;

 import com.c2kernel.utils.Language;

 import com.c2kernel.utils.Logger;

 /**

@@ -212,8 +213,6 @@ public class MainFrame extends javax.swing.JFrame {
     }

     // things to do on exit

     public void exitForm() {

-        // close connections

-        Gateway.close();

         // save window sizing

         setPref(

             "WindowSize",

@@ -242,12 +241,7 @@ public class MainFrame extends javax.swing.JFrame {
                 "Could not write to preferences file. Preferences have not been updated.");

         }

         this.setVisible(false);

-        // allow waiting threads time to quit

-        try {

-            Thread.sleep(2000);

-        } catch (InterruptedException e) {

-        }

-        System.exit(0);

+        StandardClient.close();

     }

 

     public void toggleTree() {