[cayenne] 02/02: CAY-2609 Modeler: can't close dbImport result dialog window

[ab...@apache.org]

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

abulatski pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git

commit 270fbb847eb8521c58d104390a883eeaadd6a771
Author: Arseni Bulatski <an...@gmail.com>
AuthorDate: Wed Aug 28 16:37:24 2019 +0300

    CAY-2609 Modeler: can't close dbImport result dialog window
    
    (cherry picked from commit d379c72d3f1a6d5ddc9a08b429de6c60b7aaf831)
---
 .../dialog/db/load/ModelerDbImportAction.java      | 30 ++--------------------
 1 file changed, 2 insertions(+), 28 deletions(-)

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 6144779..b81b119 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
@@ -19,8 +19,6 @@
 
 package org.apache.cayenne.modeler.dialog.db.load;
 
-import javax.swing.JDialog;
-import javax.swing.JOptionPane;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.io.IOException;
@@ -112,10 +110,7 @@ public class ModelerDbImportAction extends DefaultDbImportAction {
         logger.info("");
 
         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;
         }
 
@@ -147,28 +142,6 @@ public class ModelerDbImportAction extends DefaultDbImportAction {
     }
 
     @Override
-    protected void addMessageToLogs(String message, List<String> messages) {
-        String formattedMessage = String.format("    %-20s", message);
-        messages.add(formattedMessage);
-        resultDialog.addRowToOutput(formattedMessage, targetMap);
-        hasTokenToMerge = true;
-    }
-
-    @Override
-    protected void logMessages(List<String> messages) {
-        super.logMessages(messages);
-        if (!hasTokenToMerge) {
-            JOptionPane optionPane = new JOptionPane("Detected changes: No changes to import.", JOptionPane.PLAIN_MESSAGE);
-            JDialog dialog = optionPane.createDialog(DIALOG_TITLE);
-            dialog.setModal(false);
-            dialog.setAlwaysOnTop(true);
-            dialog.setVisible(true);
-        } else if (!resultDialog.isVisible()) {
-            resultDialog.setVisible(true);
-        }
-    }
-
-    @Override
     protected DataMap existingTargetMap(DbImportConfiguration configuration) throws IOException {
         return targetMap;
     }
@@ -194,7 +167,8 @@ public class ModelerDbImportAction extends DefaultDbImportAction {
             resultDialog.addRowToOutput(formattedMessage, targetMap);
         }
         if(!hasTokenToMerge && !hasProceduresToMerge) {
-            resultDialog.addMsg(targetMap);
+            String logString = String.format("    %-20s", "Nothing to import");
+            resultDialog.addRowToOutput(logString, targetMap);
         }
         return hasProceduresToMerge;
     }