From 93837661a3f34e6b267f053e34dfc47b50199865 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 4 Jul 2014 17:22:52 +0200 Subject: 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 --- src/main/java/com/c2kernel/gui/MainFrame.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/MainFrame.java') 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); -- cgit v1.2.3