You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2019/10/24 15:15:41 UTC
[cayenne] branch master updated: cleanup
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 6214c21 cleanup
6214c21 is described below
commit 6214c21e7f32ba4abd00b9edd2aa9f6e33ace679
Author: Nikita Timofeev <st...@gmail.com>
AuthorDate: Thu Oct 24 18:12:32 2019 +0300
cleanup
---
.../cayenne/modeler/dialog/db/load/ModelerDbImportAction.java | 10 +---------
1 file changed, 1 insertion(+), 9 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 074dc46..1021083 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
@@ -21,7 +21,6 @@ package org.apache.cayenne.modeler.dialog.db.load;
import java.awt.event.ComponentAdapter;
import java.awt.event.ComponentEvent;
-import java.io.IOException;
import java.util.Collection;
import java.util.List;
@@ -44,8 +43,6 @@ import org.slf4j.Logger;
public class ModelerDbImportAction extends DefaultDbImportAction {
- private static final String DIALOG_TITLE = "Db Import Result";
-
@Inject
private DataMap targetMap;
@@ -53,7 +50,6 @@ public class ModelerDbImportAction extends DefaultDbImportAction {
private DbImportConfiguration config;
private DbLoadResultDialog resultDialog;
- private boolean hasTokenToMerge;
private DbImportController dbImportController;
@@ -94,9 +90,7 @@ public class ModelerDbImportAction extends DefaultDbImportAction {
}
});
- resultDialog.getRevertButton().addActionListener(e -> {
- resetDialog();
- });
+ resultDialog.getRevertButton().addActionListener(e -> resetDialog());
resultDialog.addComponentListener(new ComponentAdapter() {
@Override
@@ -109,7 +103,6 @@ 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;
@@ -120,7 +113,6 @@ public class ModelerDbImportAction extends DefaultDbImportAction {
String logString = String.format(" %-20s %s", token.getTokenName(), token.getTokenValue());
logger.info(logString);
resultDialog.addRowToOutput(logString, targetMap);
- hasTokenToMerge = true;
}
logger.info("");