Some fixes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5fd1aa19 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5fd1aa19 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5fd1aa19 Branch: refs/heads/master Commit: 5fd1aa19c02cfbf78edbd0e422c468b3ed27c8d1 Parents: 5a0b4a7 Author: Arseni Bulatski <ancars...@gmail.com> Authored: Thu Nov 22 16:40:07 2018 +0300 Committer: Arseni Bulatski <ancars...@gmail.com> Committed: Thu Nov 22 16:55:31 2018 +0300 ---------------------------------------------------------------------- .../cayenne/modeler/CayenneModelerController.java | 4 ++-- .../org/apache/cayenne/modeler/ProjectController.java | 12 ++++++++++-- .../modeler/action/ReverseEngineeringAction.java | 3 ++- .../modeler/dialog/db/load/DbLoadResultDialog.java | 13 +++++++++++-- .../modeler/dialog/db/load/ModelerDbImportAction.java | 3 ++- .../apache/cayenne/modeler/editor/GeneratorsTab.java | 10 ++++++++-- .../modeler/editor/GlobalDbImportController.java | 4 ++-- .../cayenne/modeler/editor/cgen/domain/CgenTab.java | 2 +- .../modeler/editor/cgen/domain/CgenTabController.java | 2 +- .../cayenne/modeler/editor/dbimport/DbImportView.java | 10 ++++++++-- 10 files changed, 47 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java index 3d3e93c..e92d27a 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerController.java @@ -35,9 +35,9 @@ import org.apache.cayenne.project.validation.ProjectValidator; import org.apache.cayenne.validation.ValidationFailure; import org.apache.cayenne.validation.ValidationResult; -import javax.swing.*; +import javax.swing.WindowConstants; import javax.swing.filechooser.FileFilter; -import java.awt.*; +import java.awt.Component; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.dnd.DropTarget; http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java index 3dc2b3a..b385d75 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java @@ -116,9 +116,17 @@ import org.apache.cayenne.project.Project; import org.apache.cayenne.util.IDUtil; import javax.swing.event.EventListenerList; -import java.awt.*; -import java.util.*; +import java.awt.Component; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.EventListener; +import java.util.EventObject; +import java.util.HashSet; +import java.util.Iterator; import java.util.List; +import java.util.Set; import java.util.prefs.Preferences; /** http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java index 63e2ffb..3146384 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ReverseEngineeringAction.java @@ -30,7 +30,8 @@ import org.apache.cayenne.modeler.editor.dbimport.DbImportView; import org.apache.cayenne.modeler.pref.DBConnectionInfo; import org.apache.cayenne.modeler.pref.DataMapDefaults; -import javax.swing.*; +import javax.swing.JOptionPane; +import javax.swing.SwingUtilities; import java.awt.event.ActionEvent; import java.sql.SQLException; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/DbLoadResultDialog.java ---------------------------------------------------------------------- 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 4b0c28b..898b9b1 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 @@ -23,10 +23,19 @@ import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.FormLayout; import org.apache.cayenne.map.DataMap; -import javax.swing.*; +import javax.swing.BoxLayout; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JScrollPane; +import javax.swing.JTable; +import javax.swing.ListSelectionModel; import javax.swing.border.EmptyBorder; import javax.swing.table.DefaultTableModel; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.FlowLayout; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/dialog/db/load/ModelerDbImportAction.java ---------------------------------------------------------------------- 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 f17a707..a88c90b 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 @@ -37,7 +37,8 @@ import org.apache.cayenne.modeler.editor.GlobalDbImportController; import org.apache.cayenne.project.ProjectSaver; import org.slf4j.Logger; -import javax.swing.*; +import javax.swing.JDialog; +import javax.swing.JOptionPane; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java index a7e708a..4e8cf65 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GeneratorsTab.java @@ -24,8 +24,14 @@ import org.apache.cayenne.map.DataMap; import org.apache.cayenne.modeler.ProjectController; import org.apache.cayenne.modeler.util.ModelerUtil; -import javax.swing.*; -import java.awt.*; +import javax.swing.JButton; +import javax.swing.JCheckBox; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.FlowLayout; import java.util.SortedSet; import java.util.TreeSet; import java.util.concurrent.ConcurrentMap; http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GlobalDbImportController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GlobalDbImportController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GlobalDbImportController.java index 582b2d4..ec09d81 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GlobalDbImportController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/GlobalDbImportController.java @@ -39,7 +39,7 @@ public class GlobalDbImportController { this.dbLoadResultDialog = new DbLoadResultDialog(DIALOG_TITLE); } - public synchronized DbLoadResultDialog createDialog() { + public DbLoadResultDialog createDialog() { return dbLoadResultDialog; } @@ -56,7 +56,7 @@ public class GlobalDbImportController { return globalImport; } - public synchronized void checkImport(DataMap dataMap) { + public void checkImport(DataMap dataMap) { dbLoadResultDialog.getTableForMap().remove(dataMap); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java index c4f3330..ab913d3 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTab.java @@ -23,7 +23,7 @@ import org.apache.cayenne.modeler.ProjectController; import org.apache.cayenne.modeler.editor.GeneratorsTab; import org.apache.cayenne.modeler.editor.GeneratorsTabController; -import javax.swing.*; +import javax.swing.JOptionPane; /** * @since 4.1 http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java index 1a171d7..eab60fa 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/cgen/domain/CgenTabController.java @@ -31,7 +31,7 @@ import org.apache.cayenne.modeler.editor.GeneratorsTabController; import org.apache.cayenne.modeler.event.DataMapDisplayEvent; import org.apache.cayenne.modeler.util.ModelerUtil; -import javax.swing.*; +import javax.swing.JOptionPane; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; http://git-wip-us.apache.org/repos/asf/cayenne/blob/5fd1aa19/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java index ecde553..f1a33b6 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportView.java @@ -30,9 +30,15 @@ import org.apache.cayenne.modeler.dialog.db.load.TransferableNode; import org.apache.cayenne.modeler.util.CayenneAction; import org.apache.cayenne.modeler.util.ModelerUtil; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.JProgressBar; import javax.swing.border.EmptyBorder; -import java.awt.*; +import java.awt.BorderLayout; +import java.awt.FlowLayout; import java.awt.event.ActionEvent; /**
