[cayenne] branch master updated: CAY-2609 Modeler: can't close dbImport result dialog window

[abulatski]

This is an automated email from the ASF dual-hosted git repository.

abulatski 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 6e18d89  CAY-2609 Modeler: can't close dbImport result dialog window
6e18d89 is described below

commit 6e18d89728738e9a0f5bd805dfd9186d4b46722a
Author: Arseni Bulatski <ancars...@gmail.com>
AuthorDate: Wed Aug 28 16:23:14 2019 +0300

    CAY-2609 Modeler: can't close dbImport result dialog window
---
 .../org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java | 4 ----
 .../apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java  | 2 ++
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
index b3e7de6..aa0e4d4 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java
@@ -134,10 +134,6 @@ public class DbLoadResultDialog extends JDialog {
         prepareTable(dataMap).addRow(new Object[]{output});
     }
 
-    public synchronized void addMsg(DataMap dataMap) {
-        prepareTable(dataMap).addRow(new Object[]{String.format("    %-20s", 
"No changes to import")});
-    }
-
     public JButton getOkButton() {
         return okButton;
     }
diff --git 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
index a6b325e..979301a 100644
--- 
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
+++ 
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java
@@ -111,6 +111,8 @@ public class ModelerDbImportAction extends 
DefaultDbImportAction {
         if (tokens.isEmpty()) {
             logger.info("Detected changes: No changes to import.");
             hasTokenToMerge = false;
+            String logString = String.format("    %-20s", "Nothing to import");
+            resultDialog.addRowToOutput(logString, targetMap);
             return tokens;
         }