You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ab...@apache.org on 2019/08/28 13:57:24 UTC
[cayenne] branch STABLE-4.1 updated (852cf28 -> 270fbb8)
This is an automated email from the ASF dual-hosted git repository.
abulatski pushed a change to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git.
from 852cf28 CAY-2611 Exclude system catalogs and schemas when run dbImport without config
new 3aeac9c CAY-2609 Modeler: can't close dbImport result dialog window
new 270fbb8 CAY-2609 Modeler: can't close dbImport result dialog window
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../modeler/dialog/db/load/DbLoadResultDialog.java | 4 ----
.../dialog/db/load/ModelerDbImportAction.java | 28 ++--------------------
2 files changed, 2 insertions(+), 30 deletions(-)
[cayenne] 01/02: CAY-2609 Modeler: can't close dbImport result
dialog window
Posted by 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 3aeac9ccaf3ce77bab8cf051057c7a8be502a410
Author: Arseni Bulatski <an...@gmail.com>
AuthorDate: Wed Aug 28 16:23:14 2019 +0300
CAY-2609 Modeler: can't close dbImport result dialog window
(cherry picked from commit 6e18d89728738e9a0f5bd805dfd9186d4b46722a)
---
.../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 7ea58ad..abdbf6a 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 e500906..6144779 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
@@ -114,6 +114,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;
}
[cayenne] 02/02: CAY-2609 Modeler: can't close dbImport result
dialog window
Posted by 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;
}