[cayenne] branch STABLE-4.1 updated: cleanup

[ntimofeev]

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

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


The following commit(s) were added to refs/heads/STABLE-4.1 by this push:
     new c1cbfe5  cleanup
c1cbfe5 is described below

commit c1cbfe57b9f62a22c27f65137139591011a53d77
Author: Nikita Timofeev <stari...@gmail.com>
AuthorDate: Thu Oct 24 17:44:38 2019 +0300

    cleanup
---
 .../modeler/dialog/db/load/ModelerDbImportAction.java       | 13 ++++---------
 1 file changed, 4 insertions(+), 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 ae3974e..9526c28 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
@@ -46,13 +46,11 @@ import org.slf4j.Logger;
 
 public class ModelerDbImportAction extends DefaultDbImportAction {
 
-    private static final String DIALOG_TITLE = "Db Import Result";
-
     @Inject
     private DataMap targetMap;
 
-    DataMap sourceDataMap;
-    DbImportConfiguration config;
+    private DataMap sourceDataMap;
+    private DbImportConfiguration config;
 
     private DbLoadResultDialog resultDialog;
     private boolean hasTokenToMerge;
@@ -77,7 +75,6 @@ public class ModelerDbImportAction extends 
DefaultDbImportAction {
         this.sourceDataMap = loadDataMap(config);
     }
 
-
     public void commit() throws Exception {
         commit(config, sourceDataMap);
     }
@@ -96,9 +93,7 @@ public class ModelerDbImportAction extends 
DefaultDbImportAction {
             }
         });
 
-        resultDialog.getRevertButton().addActionListener(e -> {
-            resetDialog();
-        });
+        resultDialog.getRevertButton().addActionListener(e -> resetDialog());
 
         resultDialog.addComponentListener(new ComponentAdapter() {
             @Override
@@ -153,7 +148,7 @@ public class ModelerDbImportAction extends 
DefaultDbImportAction {
             hasProceduresToMerge = true;
             Procedure oldProcedure = 
targetMap.getProcedure(procedure.getName());
 
-            String msg = "";
+            String msg;
             if (oldProcedure != null) {
                 msg = "Replace procedure " + procedure.getName();
             } else {