You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2019/10/24 09:04:19 UTC
[cayenne] branch master updated: Initialize dialog early or it can
miss some information
This is an automated email from the ASF dual-hosted git repository.
ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 0744823 Initialize dialog early or it can miss some information
0744823 is described below
commit 0744823be40be8764a010f9e2113d17a61a3c1ed
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Oct 24 12:04:07 2019 +0300
Initialize dialog early or it can miss some information
---
.../org/apache/cayenne/modeler/action/ReverseEngineeringAction.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java
index f4f04d6..400d2e6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java
@@ -116,13 +116,14 @@ public class ReverseEngineeringAction extends DBWizardAction<DbActionOptionsDial
return;
}
+ DbImportController dbImportController = Application.getInstance().getFrameController().getDbImportController();
+ DbLoadResultDialog dbLoadResultDialog = dbImportController.createDialog();
+
runLoaderInThread(context, () -> {
application.getUndoManager().discardAllEdits();
try {
context.getConnection().close();
if(dataMapCount.decrementAndGet() <= 0 && !context.isInterrupted()) {
- DbImportController dbImportController = Application.getInstance().getFrameController().getDbImportController();
- DbLoadResultDialog dbLoadResultDialog = dbImportController.createDialog();
if (!dbLoadResultDialog.isVisible() && !dbLoadResultDialog.getTableForMap().isEmpty()) {
dbImportController.showDialog();
}