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

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

    CAY-2609 Modeler: can't close dbImport result dialog window
---
 .../modeler/dialog/db/load/ModelerDbImportAction.java     | 15 ---------------
 1 file changed, 15 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 979301a..86c2259 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,7 +19,6 @@
 
 package org.apache.cayenne.modeler.dialog.db.load;
 
-import javax.swing.*;
 import java.awt.event.ComponentAdapter;
 import java.awt.event.ComponentEvent;
 import java.io.IOException;
@@ -144,20 +143,6 @@ public class ModelerDbImportAction extends 
DefaultDbImportAction {
     }
 
     @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;
     }