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/07/23 11:32:52 UTC
[cayenne] branch STABLE-4.1 updated: CAY-2601 Modeler DbImport:
result dialog issues
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
The following commit(s) were added to refs/heads/STABLE-4.1 by this push:
new 2a51a90 CAY-2601 Modeler DbImport: result dialog issues
2a51a90 is described below
commit 2a51a90187e7660fbd462b464d5f9cc172f5465b
Author: Arseni Bulatski <an...@gmail.com>
AuthorDate: Tue Jul 23 14:05:08 2019 +0300
CAY-2601 Modeler DbImport: result dialog issues
(cherry picked from commit 788b7004032f17c33b1284a656838de5969f30ff)
---
RELEASE-NOTES.txt | 1 +
.../modeler/dialog/db/load/DbLoadResultDialog.java | 26 +++++++++-------------
.../dialog/db/load/ModelerDbImportAction.java | 2 +-
.../cayenne/modeler/editor/DbImportController.java | 6 +++--
4 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 0626fcf..f2ada55 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -29,6 +29,7 @@ CAY-2591 Modeler: project becomes dirty after click on dbImport or cgen tab
CAY-2594 DbImport: AutoAdapter resolving inside an import operation hangs up the op on Hana DB
CAY-2595 ObjAttributes are not sorted in alphabetical ordering on save
CAY-2596 DbImport xml config changes after dbImport plugin task execution
+CAY-2601 Modeler DbImport: result dialog issues
----------------------------------
Release: 4.1.B2
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 33ae7ea..7ea58ad 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
@@ -36,9 +36,8 @@ import java.awt.event.ActionListener;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.modeler.Application;
/**
* @since 4.1
@@ -52,8 +51,6 @@ public class DbLoadResultDialog extends JDialog {
private JButton revertButton;
private String title;
- private DefaultFormBuilder builder;
-
private ConcurrentMap<DataMap, JTable> tableForMap;
private JPanel tablePanel;
private JPanel buttonPanel;
@@ -66,7 +63,7 @@ public class DbLoadResultDialog extends JDialog {
this.tablePanel = new JPanel();
this.tablePanel.setLayout(new BoxLayout(this.tablePanel, BoxLayout.Y_AXIS));
this.scrollPane = new JScrollPane(tablePanel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS,
- JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+ JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
this.buttonPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
initElements();
buildElements();
@@ -74,14 +71,12 @@ public class DbLoadResultDialog extends JDialog {
}
private void configureDialog() {
- this.setResizable(false);
+ this.setResizable(true);
this.setTitle(title);
- this.setLocationRelativeTo(null);
this.setModal(false);
- this.setAlwaysOnTop(true);
this.setPreferredSize(new Dimension(400, 400));
- this.scrollPane.setPreferredSize(new Dimension(400, 330));
this.pack();
+ this.setLocationRelativeTo(Application.getFrame().getView());
}
private void initElements() {
@@ -90,14 +85,15 @@ public class DbLoadResultDialog extends JDialog {
}
public void buildElements() {
- getRootPane().setDefaultButton(okButton);
- FormLayout layout = new FormLayout("fill:200dlu");
- builder = new DefaultFormBuilder(layout);
- builder.append(scrollPane);
buttonPanel.add(revertButton);
buttonPanel.add(okButton);
- builder.append(buttonPanel);
- this.add(builder.getPanel());
+
+ JPanel mainPanel = new JPanel(new BorderLayout());
+ mainPanel.add(scrollPane, BorderLayout.CENTER);
+ mainPanel.add(buttonPanel, BorderLayout.SOUTH);
+ this.add(mainPanel);
+
+ getRootPane().setDefaultButton(okButton);
}
private DefaultTableModel prepareTable(DataMap dataMap) {
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 0d10909..e500906 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
@@ -48,7 +48,7 @@ import org.slf4j.Logger;
public class ModelerDbImportAction extends DefaultDbImportAction {
- private static final String DIALOG_TITLE = "Reverse Engineering Result";
+ private static final String DIALOG_TITLE = "Db Import Result";
@Inject
private DataMap targetMap;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DbImportController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DbImportController.java
index ec97576..211933e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DbImportController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/DbImportController.java
@@ -32,16 +32,18 @@ import org.apache.cayenne.modeler.dialog.db.load.DbLoadResultDialog;
*/
public class DbImportController {
- private static final String DIALOG_TITLE = "Reverse Engineering Result";
+ private static final String DIALOG_TITLE = "Db Import Result";
private DbLoadResultDialog dbLoadResultDialog;
private boolean globalImport;
public DbImportController() {
- this.dbLoadResultDialog = new DbLoadResultDialog(DIALOG_TITLE);
}
public DbLoadResultDialog createDialog() {
+ if(dbLoadResultDialog == null) {
+ dbLoadResultDialog = new DbLoadResultDialog(DIALOG_TITLE);
+ }
return dbLoadResultDialog;
}