Automatically resolve last references to child activities, finding the

numbered version that corresponds to it, or creating a new one that
does.

Conflicts:
	src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/com/c2kernel/gui/MainFrame.java b/src/main/java/com/c2kernel/gui/MainFrame.java
index cfb0260..5050e5c 100644
--- a/src/main/java/com/c2kernel/gui/MainFrame.java
+++ b/src/main/java/com/c2kernel/gui/MainFrame.java
@@ -27,8 +27,8 @@ import com.c2kernel.gui.tabs.execution.Executor;
 import com.c2kernel.gui.tree.Node;

 import com.c2kernel.gui.tree.NodeContext;

 import com.c2kernel.lookup.DomainPath;

+import com.c2kernel.process.AbstractMain;

 import com.c2kernel.process.Gateway;

-import com.c2kernel.process.StandardClient;

 import com.c2kernel.utils.Language;

 import com.c2kernel.utils.Logger;

 /**

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

         }

         this.setVisible(false);

-        StandardClient.close();

+        AbstractMain.shutdown(0);

 		// allow waiting threads time to quit

         try {

             Thread.sleep(2000);