From 16ef7d2664ec60fc227d9f4d63552eb2faffc0a2 Mon Sep 17 00:00:00 2001 From: Ralf Wisser Date: Thu, 29 Dec 2022 14:28:48 +0100 Subject: [PATCH] added TODO --- src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java | 6 +++++- src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java b/src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java index 2f1d991ec..a87917070 100644 --- a/src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java +++ b/src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java @@ -192,7 +192,7 @@ public class DbConnectionDialog extends javax.swing.JDialog { */ private Window parent; - private final ExecutionContext executionContext; + final ExecutionContext executionContext; /** * Gets connection to DB. @@ -203,6 +203,10 @@ public class DbConnectionDialog extends javax.swing.JDialog { return connect(reason, false); } + public ExecutionContext getExecutionContext() { + return executionContext; + } + private Font font = new JLabel("normal").getFont(); private Font normal = font.deriveFont(font.getStyle() & ~Font.BOLD, font.getSize()); private Font bold = font.deriveFont(font.getStyle() | Font.BOLD, font.getSize()); diff --git a/src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java b/src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java index 1e51d833a..dd35778eb 100644 --- a/src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java +++ b/src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java @@ -3915,6 +3915,8 @@ public class DataBrowser extends javax.swing.JFrame { private static DataBrowser openNewDataBrowser(DataModel datamodel, DbConnectionDialog dbConnectionDialog, boolean maximize, ExecutionContext executionContext, DataBrowser theDataBrowser) throws Exception { + // TODO IMPORTANT: do not copy here + ExecutionContext origExecContext = executionContext; if (executionContext != null) { executionContext = new ExecutionContext(executionContext); } @@ -3934,6 +3936,9 @@ public class DataBrowser extends javax.swing.JFrame { DataBrowserContext.getAppName(), null, executionContext); } dbConnectionDialog.autoConnect(); + if (origExecContext != null) { + origExecContext.setCurrentConnectionAlias(dbConnectionDialog.getExecutionContext().getCurrentConnectionAlias()); + } if (dbConnectionDialog.isConnected || dbConnectionDialog.connect(DataBrowserContext.getAppName(true))) { try { dataBrowser.setConnection(dbConnectionDialog);