[cayenne] branch master updated: fix: set revert button visibility on false if there are nothing to import

[ntimofeev]

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 d5fbfc8  fix: set revert button visibility on false if there are 
nothing to import
     new cf2aa1f  Merge pull request #464 from 
dmitars/CAY-2621_PROJECT-IS-DIRTY-AFTER-NO-CHANGE-IMPORT
d5fbfc8 is described below

commit d5fbfc855cef50c8f4e49b66ee43f884880e5db1
Author: dmitars <dmitriy.tarasie...@gmail.com>
AuthorDate: Thu Aug 5 11:51:11 2021 +0300

    fix: set revert button visibility on false if there are nothing to import
---
 .../org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java | 4 ++++
 .../apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java  | 2 ++
 2 files changed, 6 insertions(+)

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 aa0e4d4..a95188a 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
@@ -130,6 +130,10 @@ public class DbLoadResultDialog extends JDialog {
         }
     }
 
+    public void refreshElements(){
+        revertButton.setVisible(true);
+    }
+
     public synchronized void addRowToOutput(String output, DataMap dataMap) {
         prepareTable(dataMap).addRow(new Object[]{output});
     }
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 1021083..395f83a 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
@@ -79,6 +79,7 @@ public class ModelerDbImportAction extends 
DefaultDbImportAction {
     @Override
     protected Collection<MergerToken> log(List<MergerToken> tokens) {
         resultDialog = dbImportController.createDialog();
+        resultDialog.refreshElements();
         resultDialog.getOkButton().addActionListener(e -> {
             try {
                 if(resultDialog.getTableForMap().containsKey(targetMap)) {
@@ -104,6 +105,7 @@ public class ModelerDbImportAction extends 
DefaultDbImportAction {
         if (tokens.isEmpty()) {
             logger.info("Detected changes: No changes to import.");
             String logString = String.format("    %-20s", "Nothing to import");
+            resultDialog.getRevertButton().setVisible(false);
             resultDialog.addRowToOutput(logString, targetMap);
             return tokens;
         }