mirror/Jailer
1
0
Fork 0
mirror of https://github.com/Wisser/Jailer.git synced 2026-05-16 19:38:39 -05:00
Code Issues Packages Projects Releases 105 Wiki Activity

added TODO

Browse Source
This commit is contained in:
Ralf Wisser
2022-12-29 14:28:48 +01:00
parent be96b39216
commit 16ef7d2664
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/gui/net/sf/jailer/ui/DbConnectionDialog.java
+5 -1
View File
@@ -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());
src/main/gui/net/sf/jailer/ui/databrowser/DataBrowser.java
+5
View File
@@ -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);