This is an automated email from the ASF dual-hosted git repository.
aadamchik 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 6c11de786 Modeler cleanup
6c11de786 is described below
commit 6c11de786d9a74c78020419cb69a8c50763f878d
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sun Apr 12 19:33:56 2026 -0400
Modeler cleanup
---
.../cayenne/configuration/event/DataMapEvent.java | 15 --
.../configuration/event/DataMapListener.java | 15 +-
.../configuration/event/DataNodeListener.java | 29 ++-
.../configuration/event/DomainListener.java | 15 +-
.../configuration/event/ProcedureListener.java | 20 +-
.../event/ProcedureParameterEvent.java | 8 -
.../event/ProcedureParameterListener.java | 22 +--
.../cayenne/configuration/event/QueryListener.java | 18 +-
.../apache/cayenne/modeler/action/AboutAction.java | 19 +-
.../apache/cayenne/modeler/action/CopyAction.java | 32 +--
.../action/CopyAttributeRelationshipAction.java | 8 +-
.../modeler/action/CreateCallbackMethodAction.java | 20 +-
.../cayenne/modeler/action/CreateNodeAction.java | 5 -
.../modeler/action/CreateObjEntityAction.java | 3 -
.../action/CreateProcedureParameterAction.java | 3 -
.../cayenne/modeler/action/CreateQueryAction.java | 19 +-
.../modeler/action/CreateRelationshipAction.java | 13 +-
.../apache/cayenne/modeler/action/CutAction.java | 23 +--
.../action/CutAttributeRelationshipAction.java | 8 +-
.../action/CutProcedureParameterAction.java | 11 +-
.../modeler/action/CutRelationshipAction.java | 8 +-
.../modeler/action/DbEntityCounterpartAction.java | 11 +-
.../cayenne/modeler/action/DbEntitySyncAction.java | 219 ++++++++++-----------
.../modeler/action/DefaultActionManager.java | 20 +-
.../action/DisableValidationInspectionAction.java | 3 +-
.../modeler/action/ImportDataMapAction.java | 2 +-
.../modeler/action/ImportEOModelAction.java | 2 +-
.../modeler/action/InferRelationshipsAction.java | 10 +-
.../cayenne/modeler/action/LinkDataMapAction.java | 11 +-
.../cayenne/modeler/action/LinkDataMapsAction.java | 13 +-
.../cayenne/modeler/action/LoadDbSchemaAction.java | 14 +-
.../cayenne/modeler/action/MigrateAction.java | 4 +-
.../modeler/action/MultipleObjectsAction.java | 7 +-
.../modeler/action/NavigateBackwardAction.java | 17 +-
.../modeler/action/NavigateForwardAction.java | 18 +-
.../cayenne/modeler/action/NewProjectAction.java | 9 +-
.../action/dbimport/AddPatternParamAction.java | 1 -
.../modeler/action/dbimport/DeleteNodeAction.java | 2 +-
.../modeler/action/dbimport/EditNodeAction.java | 3 +-
.../dbimport/ReverseEngineeringToolMenuAction.java | 1 -
.../action/dbimport/TreeManipulationAction.java | 4 +-
.../modeler/editor/dbimport/DbImportTree.java | 2 +-
.../cayenne/modeler/event/DataMapEventTest.java | 10 -
43 files changed, 244 insertions(+), 453 deletions(-)
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapEvent.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapEvent.java
index b02f79d6f..7d5ab8197 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapEvent.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapEvent.java
@@ -28,39 +28,24 @@ import org.apache.cayenne.map.event.MapEvent;
public class DataMapEvent extends MapEvent {
protected DataMap dataMap;
- /** Creates a DataMap change event. */
public DataMapEvent(Object src, DataMap dataMap) {
super(src);
this.dataMap = dataMap;
}
- /** Creates a DataMap event of a specified type. */
public DataMapEvent(Object src, DataMap dataMap, int id) {
this(src, dataMap);
setId(id);
}
- /** Creates a DataMap name change event.*/
public DataMapEvent(Object src, DataMap dataMap, String oldName) {
this(src, dataMap);
setOldName(oldName);
}
- /**
- * Returns DataMap associated with this event.
- */
public DataMap getDataMap() {
return dataMap;
}
-
- /**
- * Sets DataMap associated with this event.
- *
- * @param dataMap The dataMap to set
- */
- public void setDataMap(DataMap dataMap) {
- this.dataMap = dataMap;
- }
@Override
public String getNewName() {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapListener.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapListener.java
index dbb9b6125..ff9e898a3 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapListener.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataMapListener.java
@@ -26,19 +26,10 @@ import java.util.EventListener;
*/
public interface DataMapListener extends EventListener {
- /**
- * Called on DataMap property changes.
- */
- public void dataMapChanged(DataMapEvent e);
+ void dataMapChanged(DataMapEvent e);
- /**
- * Called when a new DataMap is added.
- */
- public void dataMapAdded(DataMapEvent e);
+ void dataMapAdded(DataMapEvent e);
- /**
- * Called when a DataMap is removed.
- */
- public void dataMapRemoved(DataMapEvent e);
+ void dataMapRemoved(DataMapEvent e);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataNodeListener.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataNodeListener.java
index a4d42966e..4045e176c 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataNodeListener.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DataNodeListener.java
@@ -21,15 +21,24 @@ package org.apache.cayenne.configuration.event;
import java.util.EventListener;
-/** For managing the changes in the DataNode */
-public interface DataNodeListener extends EventListener
-{
- /** DataNode property (usually - name) changed. */
- public void dataNodeChanged(DataNodeEvent e);
- /** New data map has been created/added.*/
- public void dataNodeAdded(DataNodeEvent e);
- /** DataNode has been removed.*/
- public void dataNodeRemoved(DataNodeEvent e);
-
+/**
+ * For managing the changes in the DataNode
+ */
+public interface DataNodeListener extends EventListener {
+ /**
+ * DataNode property (usually - name) changed.
+ */
+ void dataNodeChanged(DataNodeEvent e);
+
+ /**
+ * New data map has been created/added.
+ */
+ void dataNodeAdded(DataNodeEvent e);
+
+ /**
+ * DataNode has been removed.
+ */
+ void dataNodeRemoved(DataNodeEvent e);
+
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DomainListener.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DomainListener.java
index 972149c64..932209e13 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DomainListener.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/DomainListener.java
@@ -21,11 +21,14 @@ package org.apache.cayenne.configuration.event;
import java.util.EventListener;
-/** For managing the changes in the Domain */
-public interface DomainListener extends EventListener
-{
- /** Domain property (usually - name) changed. */
- public void domainChanged(DomainEvent e);
-
+/**
+ * For managing the changes in the Domain
+ */
+public interface DomainListener extends EventListener {
+ /**
+ * Domain property (usually - name) changed.
+ */
+ void domainChanged(DomainEvent e);
+
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureListener.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureListener.java
index f42797598..313ce730b 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureListener.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureListener.java
@@ -21,23 +21,23 @@ package org.apache.cayenne.configuration.event;
import java.util.EventListener;
-/**
+/**
* Listener for Procedure events.
- *
+ *
*/
public interface ProcedureListener extends EventListener {
- /**
- * Procedure changed.
+ /**
+ * Procedure changed.
*/
- public void procedureChanged(ProcedureEvent e);
+ void procedureChanged(ProcedureEvent e);
- /**
- * New Procedure has been created.
+ /**
+ * New Procedure has been created.
*/
- public void procedureAdded(ProcedureEvent e);
+ void procedureAdded(ProcedureEvent e);
- /**
+ /**
* Procedure has been removed.
*/
- public void procedureRemoved(ProcedureEvent e);
+ void procedureRemoved(ProcedureEvent e);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterEvent.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterEvent.java
index 8496c3a79..67cfeb929 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterEvent.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterEvent.java
@@ -32,14 +32,6 @@ public class ProcedureParameterEvent extends MapEvent {
setParameter(parameter);
}
- public ProcedureParameterEvent(
- Object source,
- ProcedureParameter parameter,
- String oldName) {
- this(source, parameter);
- setOldName(oldName);
- }
-
public ProcedureParameterEvent(
Object source,
ProcedureParameter parameter,
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterListener.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterListener.java
index 7fdb8d959..b62aa0b9a 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterListener.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/ProcedureParameterListener.java
@@ -21,23 +21,23 @@ package org.apache.cayenne.configuration.event;
import java.util.EventListener;
-/**
+/**
* Listener for ProcedureParameterEvents.
- *
+ *
*/
public interface ProcedureParameterListener extends EventListener {
- /**
- * Called when procedure parameter has changed.
- */
- public void procedureParameterChanged(ProcedureParameterEvent e);
+ /**
+ * Called when procedure parameter has changed.
+ */
+ void procedureParameterChanged(ProcedureParameterEvent e);
- /**
- * Called when new procedure parameter has been created.
+ /**
+ * Called when new procedure parameter has been created.
*/
- public void procedureParameterAdded(ProcedureParameterEvent e);
+ void procedureParameterAdded(ProcedureParameterEvent e);
- /**
+ /**
* Called when procedure parameter has been removed.
*/
- public void procedureParameterRemoved(ProcedureParameterEvent e);
+ void procedureParameterRemoved(ProcedureParameterEvent e);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryListener.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryListener.java
index 0d83b054c..9f6174e2f 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryListener.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/configuration/event/QueryListener.java
@@ -23,22 +23,14 @@ import java.util.EventListener;
/**
* Listener for QueryEvents.
- *
+ *
* @since 1.1
*/
public interface QueryListener extends EventListener {
- /**
- * Query changed.
- */
- public void queryChanged(QueryEvent e);
- /**
- * New Query has been created.
- */
- public void queryAdded(QueryEvent e);
+ void queryChanged(QueryEvent e);
+
+ void queryAdded(QueryEvent e);
- /**
- * Query has been removed.
- */
- public void queryRemoved(QueryEvent e);
+ void queryRemoved(QueryEvent e);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AboutAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AboutAction.java
index c1fe10691..70da09576 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AboutAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/AboutAction.java
@@ -19,30 +19,19 @@
package org.apache.cayenne.modeler.action;
-import java.awt.event.ActionEvent;
-
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.dialog.AboutDialog;
import org.apache.cayenne.modeler.util.CayenneAction;
-/**
- */
-public class AboutAction extends CayenneAction {
+import java.awt.event.ActionEvent;
- public static final String getActionName() {
- return "About CayenneModeler";
- }
+public class AboutAction extends CayenneAction {
- /**
- * Constructor for AboutMenuAction.
- */
public AboutAction(Application application) {
- super(getActionName(), application);
+ super("About CayenneModeler", application);
}
- /**
- * Displays About dialog.
- */
+ @Override
public void performAction(ActionEvent e) {
showAboutDialog();
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAction.java
index 656a8bcde..906651c0e 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAction.java
@@ -18,15 +18,7 @@
****************************************************************/
package org.apache.cayenne.modeler.action;
-import java.awt.Toolkit;
-import java.awt.datatransfer.Clipboard;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
-
import org.apache.cayenne.configuration.ConfigurationNode;
-import org.apache.cayenne.configuration.EmptyConfigurationNodeVisitor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
@@ -44,9 +36,12 @@ import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.editor.ObjCallbackMethod;
import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.modeler.util.CayenneTransferable;
-import org.apache.cayenne.query.Query;
-import org.apache.cayenne.util.XMLEncoder;
-import org.apache.cayenne.util.XMLSerializable;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
/**
* Action for copying entities, queries etc. into system buffer
@@ -106,13 +101,6 @@ public class CopyAction extends CayenneAction {
return mediator.getCurrentObject();
}
- /**
- * Prints an object in XML format to an output stream
- */
- protected void print(XMLEncoder encoder, XMLSerializable object) {
- object.encodeAsXML(encoder, new EmptyConfigurationNodeVisitor());
- }
-
/**
* Returns <code>true</code> if last object in the path contains a
removable object.
*/
@@ -122,7 +110,7 @@ public class CopyAction extends CayenneAction {
return false;
}
- if (object instanceof DataMap
+ return object instanceof DataMap
|| object instanceof QueryDescriptor
|| object instanceof DbEntity
|| object instanceof ObjEntity
@@ -134,10 +122,6 @@ public class CopyAction extends CayenneAction {
|| object instanceof ObjRelationship
|| object instanceof ObjCallbackMethod
|| object instanceof Procedure
- || object instanceof ProcedureParameter) {
- return true;
- }
-
- return false;
+ || object instanceof ProcedureParameter;
}
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAttributeRelationshipAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAttributeRelationshipAction.java
index f39ca445b..3dfbd40ab 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAttributeRelationshipAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CopyAttributeRelationshipAction.java
@@ -27,8 +27,8 @@ import javax.swing.JComponent;
public class CopyAttributeRelationshipAction extends CopyAction implements
MultipleObjectsAction {
- private CopyAttributeAction copyAttributeAction;
- private CopyRelationshipAction copyRelationshipAction;
+ private final CopyAttributeAction copyAttributeAction;
+ private final CopyRelationshipAction copyRelationshipAction;
private JComponent currentSelectedPanel;
protected CopyAttributeRelationshipAction(Application application) {
@@ -37,10 +37,6 @@ public class CopyAttributeRelationshipAction extends
CopyAction implements Multi
copyRelationshipAction = new CopyRelationshipAction(application);
}
- public JComponent getCurrentSelectedPanel() {
- return currentSelectedPanel;
- }
-
public void setCurrentSelectedPanel(JComponent currentSelectedPanel) {
this.currentSelectedPanel = currentSelectedPanel;
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodAction.java
index 3fe8a9a43..2493d7b24 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateCallbackMethodAction.java
@@ -36,26 +36,8 @@ import java.awt.event.ActionEvent;
*/
public class CreateCallbackMethodAction extends CayenneAction {
- /**
- * unique action name
- */
- public static final String ACTION_NAME = "Create callback method";
-
- /**
- * Constructor.
- *
- * @param actionName unique action name
- * @param application Application instance
- */
- public CreateCallbackMethodAction(String actionName, Application
application) {
- super(actionName, application);
- }
+ private static final String ACTION_NAME = "Create callback method";
- /**
- * Constructor.
- *
- * @param application Application instance
- */
public CreateCallbackMethodAction(Application application) {
super(ACTION_NAME, application);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
index ddd960b44..a104e3e98 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateNodeAction.java
@@ -38,11 +38,6 @@ import java.awt.event.ActionEvent;
public class CreateNodeAction extends CayenneAction {
- /**
- * Constructor for CreateNodeAction.
- *
- * @param application
- */
public CreateNodeAction(Application application) {
super(getActionName(), application);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
index 5fde3d080..e73e705e4 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateObjEntityAction.java
@@ -41,9 +41,6 @@ import java.awt.event.ActionEvent;
public class CreateObjEntityAction extends CayenneAction {
- /**
- * Constructor for CreateObjEntityAction.
- */
public CreateObjEntityAction(Application application) {
super(getActionName(), application);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureParameterAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureParameterAction.java
index d867b129b..eb81ed971 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureParameterAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateProcedureParameterAction.java
@@ -36,9 +36,6 @@ import java.awt.event.ActionEvent;
public class CreateProcedureParameterAction extends CayenneAction {
- /**
- * Constructor for CreateProcedureParameterAction.
- */
public CreateProcedureParameterAction(Application application) {
super(getActionName(), application);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
index 8e0e0c0c1..9202ec754 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateQueryAction.java
@@ -19,41 +19,34 @@
package org.apache.cayenne.modeler.action;
-import java.awt.event.ActionEvent;
-
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.event.QueryEvent;
import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.QueryDescriptor;
import org.apache.cayenne.map.event.MapEvent;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.dialog.query.QueryType;
import org.apache.cayenne.modeler.event.QueryDisplayEvent;
import org.apache.cayenne.modeler.util.CayenneAction;
-import org.apache.cayenne.map.QueryDescriptor;
+
+import java.awt.event.ActionEvent;
/**
* @since 1.1
*/
public class CreateQueryAction extends CayenneAction {
-
-
- public static String getActionName() {
- return "Create Query";
- }
-
- /**
- * Constructor for CreateQueryAction.
- */
public CreateQueryAction(Application application) {
- super(getActionName(), application);
+ super("Create Query", application);
}
+ @Override
public String getIconName() {
return "icon-new_query.png";
}
+ @Override
public void performAction(ActionEvent e) {
createQuery();
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
index 2e063f234..f4c00132d 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CreateRelationshipAction.java
@@ -19,8 +19,6 @@
package org.apache.cayenne.modeler.action;
-import java.awt.event.ActionEvent;
-
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DbEntity;
@@ -39,17 +37,12 @@ import
org.apache.cayenne.modeler.event.RelationshipDisplayEvent;
import org.apache.cayenne.modeler.util.CayenneAction;
import org.apache.cayenne.util.DeleteRuleUpdater;
+import java.awt.event.ActionEvent;
+
public class CreateRelationshipAction extends CayenneAction {
- /**
- * Constructor for CreateRelationshipAction.
- */
public CreateRelationshipAction(Application application) {
- super(getActionName(), application);
- }
-
- public static String getActionName() {
- return "Create Relationship";
+ super("Create Relationship", application);
}
/**
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAction.java
index e2baf52c4..6a9c28df7 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAction.java
@@ -18,35 +18,24 @@
****************************************************************/
package org.apache.cayenne.modeler.action;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-
-import javax.swing.KeyStroke;
-
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.util.CayenneAction;
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+
/**
* Action for cutting entities, queries etc.
*/
public class CutAction extends CayenneAction {
- public static String getActionName() {
- return "Cut";
- }
-
- /**
- * Constructor for CutAction
- */
public CutAction(Application application) {
- this(getActionName(), application);
+ this("Cut", application);
}
- /**
- * Constructor for descendants
- */
protected CutAction(String name, Application application) {
super(name, application);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAttributeRelationshipAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAttributeRelationshipAction.java
index 390906760..c6d4188a2 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAttributeRelationshipAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutAttributeRelationshipAction.java
@@ -29,8 +29,8 @@ import java.awt.event.ActionEvent;
public class CutAttributeRelationshipAction extends CutAction implements
MultipleObjectsAction {
- private CutAttributeAction cutAttributeAction;
- private CutRelationshipAction cutRelationshipAction;
+ private final CutAttributeAction cutAttributeAction;
+ private final CutRelationshipAction cutRelationshipAction;
private JComponent currentSelectedPanel;
public CutAttributeRelationshipAction(Application application) {
@@ -39,10 +39,6 @@ public class CutAttributeRelationshipAction extends
CutAction implements Multipl
cutRelationshipAction = new CutRelationshipAction(application);
}
- public JComponent getCurrentSelectedPanel() {
- return currentSelectedPanel;
- }
-
public void setCurrentSelectedPanel(JComponent currentSelectedPanel) {
this.currentSelectedPanel = currentSelectedPanel;
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutProcedureParameterAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutProcedureParameterAction.java
index acbeb45d9..1cc7b917f 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutProcedureParameterAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutProcedureParameterAction.java
@@ -18,23 +18,18 @@
****************************************************************/
package org.apache.cayenne.modeler.action;
-import java.awt.event.ActionEvent;
-
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.map.ProcedureParameter;
import org.apache.cayenne.modeler.Application;
+import java.awt.event.ActionEvent;
+
/**
* Action for cutting procedure parameter(s)
*/
-public class CutProcedureParameterAction extends CutAction implements
- MultipleObjectsAction {
+public class CutProcedureParameterAction extends CutAction implements
MultipleObjectsAction {
private final static String ACTION_NAME = "Cut Procedure Parameter";
-
- /**
- * Name of action if multiple attrs are selected
- */
private final static String ACTION_NAME_MULTIPLE = "Cut Procedure
Parameters";
public static String getActionName() {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutRelationshipAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutRelationshipAction.java
index 89f71258b..e0fad81ed 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutRelationshipAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/CutRelationshipAction.java
@@ -18,22 +18,18 @@
****************************************************************/
package org.apache.cayenne.modeler.action;
-import java.awt.event.ActionEvent;
-
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.modeler.Application;
+import java.awt.event.ActionEvent;
+
/**
* Action for cutting attribute(s)
*/
public class CutRelationshipAction extends CutAction implements
MultipleObjectsAction {
private final static String ACTION_NAME = "Cut Relationship";
-
- /**
- * Name of action if multiple attrs are selected
- */
private final static String ACTION_NAME_MULTIPLE = "Cut Relationships";
public static String getActionName() {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
index 8e9750aab..7e5391fd7 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntityCounterpartAction.java
@@ -19,21 +19,16 @@
package org.apache.cayenne.modeler.action;
-import java.util.Iterator;
-
import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
-public class DbEntityCounterpartAction extends BaseViewEntityAction {
+import java.util.Iterator;
- public static String getActionName() {
- return "View related ObjEntity";
- }
+public class DbEntityCounterpartAction extends BaseViewEntityAction {
public DbEntityCounterpartAction(Application application) {
- super(getActionName(), application);
+ super("View related ObjEntity", application);
}
public String getIconName() {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
index 9b2001994..1fee200b0 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
@@ -34,12 +34,11 @@ import
org.apache.cayenne.modeler.dialog.objentity.EntitySyncController;
import org.apache.cayenne.modeler.undo.DbEntitySyncUndoableEdit;
import org.apache.cayenne.modeler.util.CayenneAction;
-import javax.swing.KeyStroke;
-import java.awt.Toolkit;
+import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
import java.util.Collection;
-import java.util.Iterator;
/**
* Action that synchronizes all ObjEntities with the current state of the
@@ -47,116 +46,106 @@ import java.util.Iterator;
*/
public class DbEntitySyncAction extends CayenneAction {
- public static String getActionName() {
- return "Sync Dependent ObjEntities with DbEntity";
- }
-
- public DbEntitySyncAction(final Application application) {
- super(getActionName(), application);
- }
-
- @Override
- public KeyStroke getAcceleratorKey() {
- return KeyStroke.getKeyStroke(KeyEvent.VK_U,
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
- }
-
- public String getIconName() {
- return "icon-sync.png";
- }
-
- /**
- * @see
org.apache.cayenne.modeler.util.CayenneAction#performAction(ActionEvent)
- */
- public void performAction(final ActionEvent e) {
- syncDbEntity();
- }
-
- protected void syncDbEntity() {
- final ProjectController mediator = getProjectController();
- final DbEntity dbEntity = mediator.getCurrentDbEntity();
-
- if (dbEntity != null) {
-
- final Collection<ObjEntity> entities =
dbEntity.getDataMap().getMappedEntities(dbEntity);
- if (entities.isEmpty()) {
- return;
- }
-
- final EntityMergeSupport merger = new
EntitySyncController(Application.getInstance().getFrameController(), dbEntity)
- .createMerger();
-
- if (merger == null) {
- return;
- }
-
- merger.setNameGenerator(new
PreserveRelationshipNameGenerator());
-
- final DbEntitySyncUndoableEdit undoableEdit = new
DbEntitySyncUndoableEdit((DataChannelDescriptor) mediator
- .getProject().getRootNode(),
mediator.getCurrentDataMap());
-
- // filter out inherited entities, as we need to add
attributes only to the roots
- filterInheritedEntities(entities);
-
- boolean hasChanges = false;
- for (final ObjEntity entity : entities) {
-
- final
DbEntitySyncUndoableEdit.EntitySyncUndoableListener listener = undoableEdit.new
EntitySyncUndoableListener(
- entity);
-
- merger.addEntityMergeListener(listener);
-
- final Collection<DbAttribute> meaningfulFKs =
merger.getMeaningfulFKs(entity);
-
- // TODO: addition or removal of model objects
should be reflected in listener callbacks...
- // we should not be trying to introspect the
merger
- if (merger.isRemovingMeaningfulFKs() &&
!meaningfulFKs.isEmpty()) {
- undoableEdit.addEdit(undoableEdit.new
MeaningfulFKsUndoableEdit(entity, meaningfulFKs));
- hasChanges = true;
- }
-
- if (merger.synchronizeWithDbEntity(entity)) {
- mediator.fireObjEntityEvent(new
EntityEvent(this, entity, MapEvent.CHANGE));
- hasChanges = true;
- }
-
- merger.removeEntityMergeListener(listener);
- }
-
- if (hasChanges) {
-
application.getUndoManager().addEdit(undoableEdit);
- }
- }
- }
-
- /**
- * This method works only for case when all inherited entities bound to
same DbEntity
- * if this will ever change some additional checks should be performed.
- */
- private void filterInheritedEntities(final Collection<ObjEntity>
entities) {
- // entities.removeIf(c -> c.getSuperEntity() != null);
- final Iterator<ObjEntity> it = entities.iterator();
- while (it.hasNext()) {
- if (it.next().getSuperEntity() != null) {
- it.remove();
- }
- }
- }
-
- static class PreserveRelationshipNameGenerator extends
DefaultObjectNameGenerator {
-
- @Override
- public String relationshipName(final DbRelationship...
relationshipChain) {
- if (relationshipChain.length == 0) {
- return
super.relationshipName(relationshipChain);
- }
- final DbRelationship last =
relationshipChain[relationshipChain.length - 1];
- // must be in sync with
DefaultBaseNameVisitor.visitDbRelationship
- if (last.getName().startsWith("untitledRel")) {
- return
super.relationshipName(relationshipChain);
- }
-
- // keep manually set relationship name
- return last.getName();
- }
- }
+ public DbEntitySyncAction(Application application) {
+ super("Sync Dependent ObjEntities with DbEntity", application);
+ }
+
+ @Override
+ public KeyStroke getAcceleratorKey() {
+ return KeyStroke.getKeyStroke(KeyEvent.VK_U,
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
+ }
+
+ public String getIconName() {
+ return "icon-sync.png";
+ }
+
+ /**
+ * @see
org.apache.cayenne.modeler.util.CayenneAction#performAction(ActionEvent)
+ */
+ public void performAction(ActionEvent e) {
+ syncDbEntity();
+ }
+
+ protected void syncDbEntity() {
+ ProjectController mediator = getProjectController();
+ DbEntity dbEntity = mediator.getCurrentDbEntity();
+
+ if (dbEntity != null) {
+
+ Collection<ObjEntity> entities =
dbEntity.getDataMap().getMappedEntities(dbEntity);
+ if (entities.isEmpty()) {
+ return;
+ }
+
+ final EntityMergeSupport merger = new
EntitySyncController(Application.getInstance().getFrameController(), dbEntity)
+ .createMerger();
+
+ if (merger == null) {
+ return;
+ }
+
+ merger.setNameGenerator(new PreserveRelationshipNameGenerator());
+
+ DbEntitySyncUndoableEdit undoableEdit = new
DbEntitySyncUndoableEdit((DataChannelDescriptor) mediator
+ .getProject().getRootNode(), mediator.getCurrentDataMap());
+
+ // filter out inherited entities, as we need to add attributes
only to the roots
+ filterInheritedEntities(entities);
+
+ boolean hasChanges = false;
+ for (final ObjEntity entity : entities) {
+
+ final DbEntitySyncUndoableEdit.EntitySyncUndoableListener
listener = undoableEdit.new EntitySyncUndoableListener(
+ entity);
+
+ merger.addEntityMergeListener(listener);
+
+ final Collection<DbAttribute> meaningfulFKs =
merger.getMeaningfulFKs(entity);
+
+ // TODO: addition or removal of model objects should be
reflected in listener callbacks...
+ // we should not be trying to introspect the merger
+ if (merger.isRemovingMeaningfulFKs() &&
!meaningfulFKs.isEmpty()) {
+ undoableEdit.addEdit(undoableEdit.new
MeaningfulFKsUndoableEdit(entity, meaningfulFKs));
+ hasChanges = true;
+ }
+
+ if (merger.synchronizeWithDbEntity(entity)) {
+ mediator.fireObjEntityEvent(new EntityEvent(this, entity,
MapEvent.CHANGE));
+ hasChanges = true;
+ }
+
+ merger.removeEntityMergeListener(listener);
+ }
+
+ if (hasChanges) {
+ application.getUndoManager().addEdit(undoableEdit);
+ }
+ }
+ }
+
+ /**
+ * This method works only for case when all inherited entities bound to
same DbEntity
+ * if this will ever change some additional checks should be performed.
+ */
+ private void filterInheritedEntities(final Collection<ObjEntity> entities)
{
+ entities.removeIf(e -> e.getSuperEntity() != null);
+ }
+
+ static class PreserveRelationshipNameGenerator extends
DefaultObjectNameGenerator {
+
+ @Override
+ public String relationshipName(final DbRelationship...
relationshipChain) {
+ if (relationshipChain.length == 0) {
+ return super.relationshipName(relationshipChain);
+ }
+ final DbRelationship last =
relationshipChain[relationshipChain.length - 1];
+ // must be in sync with DefaultBaseNameVisitor.visitDbRelationship
+ if (last.getName().startsWith("untitledRel")) {
+ return super.relationshipName(relationshipChain);
+ }
+
+ // keep manually set relationship name
+ return last.getName();
+ }
+ }
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
index 24dd89518..5b07498f0 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java
@@ -250,12 +250,12 @@ public class DefaultActionManager implements
ActionManager {
EMBEDDABLE_ACTIONS = new HashSet<>(DATA_MAP_ACTIONS);
-
EMBEDDABLE_ACTIONS.addAll(Collections.singletonList(CreateAttributeAction.class.getName()));
+ EMBEDDABLE_ACTIONS.add(CreateAttributeAction.class.getName());
PROCEDURE_ACTIONS = new HashSet<>(DATA_MAP_ACTIONS);
-
PROCEDURE_ACTIONS.addAll(Collections.singletonList(CreateProcedureParameterAction.class
- .getName()));
+ PROCEDURE_ACTIONS.add(CreateProcedureParameterAction.class
+ .getName());
MULTIPLE_OBJECTS_ACTIONS = new HashSet<>(PROJECT_ACTIONS);
@@ -280,18 +280,6 @@ public class DefaultActionManager implements ActionManager
{
return action;
}
- public void addProjectAction(String actionName) {
- if (!PROJECT_ACTIONS.contains(actionName)) {
- PROJECT_ACTIONS.add(actionName);
- }
- }
-
- public void removeProjectaction(String actionName) {
- if (PROJECT_ACTIONS.contains(actionName)) {
- PROJECT_ACTIONS.remove(actionName);
- }
- }
-
@SuppressWarnings("unchecked")
public <T extends Action> T getAction(Class<T> actionClass) {
return (T) actionMap.get(actionClass.getName());
@@ -393,7 +381,7 @@ public class DefaultActionManager implements ActionManager {
* Updates Remove, Cut and Copy actions' names
*/
private void updateActions(String postfix) {
- if (postfix.length() > 0) {
+ if (!postfix.isEmpty()) {
postfix = " " + postfix;
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DisableValidationInspectionAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DisableValidationInspectionAction.java
index b41c4fb0a..0bcb6fd80 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DisableValidationInspectionAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DisableValidationInspectionAction.java
@@ -31,8 +31,7 @@ import java.util.EnumSet;
*/
public class DisableValidationInspectionAction extends
UpdateValidationConfigAction {
- public static final String ACTION_NAME = "Disable inspection";
-
+ private static final String ACTION_NAME = "Disable inspection";
private static final String INSPECTION_PARAM = "inspection";
private final ValidateAction validationAction;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
index b295ff286..c5ca8496e 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportDataMapAction.java
@@ -50,7 +50,7 @@ public class ImportDataMapAction extends CayenneAction {
private static final Logger LOGGER =
LoggerFactory.getLogger(ImportDataMapAction.class);
- private ConfigurationNameMapper nameMapper;
+ private final ConfigurationNameMapper nameMapper;
public ImportDataMapAction(Application application,
ConfigurationNameMapper nameMapper) {
super(getActionName(), application);
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
index 56c1ab253..3d966242c 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/ImportEOModelAction.java
@@ -315,7 +315,7 @@ public class ImportEOModelAction extends CayenneAction {
/**
* Custom file chooser that will pop up again if a bad directory is
selected.
*/
- class EOModelChooser extends JFileChooser {
+ static class EOModelChooser extends JFileChooser {
protected FileFilter selectFilter;
protected JDialog cachedDialog;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/InferRelationshipsAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/InferRelationshipsAction.java
index 06506aff1..17e80579e 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/InferRelationshipsAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/InferRelationshipsAction.java
@@ -18,25 +18,21 @@
****************************************************************/
package org.apache.cayenne.modeler.action;
-import java.awt.event.ActionEvent;
-
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.modeler.Application;
import
org.apache.cayenne.modeler.dialog.autorelationship.InferRelationshipsController;
import org.apache.cayenne.modeler.util.CayenneAction;
+import java.awt.event.ActionEvent;
+
public class InferRelationshipsAction extends CayenneAction {
-
- public static final String getActionName() {
- return "Infer Relationships";
- }
/**
* Constructor for ShowLogConsoleAction.
*/
public InferRelationshipsAction(Application application) {
- super(getActionName(), application);
+ super("Infer Relationships", application);
}
@Override
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LinkDataMapAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LinkDataMapAction.java
index 6dc6f667e..6b14d0961 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LinkDataMapAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LinkDataMapAction.java
@@ -33,17 +33,8 @@ import java.util.Collection;
public class LinkDataMapAction extends CayenneAction {
- public static String getActionName() {
- return "Link DataMap";
- }
-
- /**
- * Constructor for LinkDataMapAction.
- *
- * @param application
- */
public LinkDataMapAction(Application application) {
- super(getActionName(), application);
+ super("Link DataMap", application);
}
public void linkDataMap(DataMap map, DataNodeDescriptor node) {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LinkDataMapsAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LinkDataMapsAction.java
index 9e3ea3b90..39f611ec3 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LinkDataMapsAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LinkDataMapsAction.java
@@ -32,18 +32,9 @@ import java.util.ArrayList;
import java.util.Collection;
public class LinkDataMapsAction extends CayenneAction {
-
- public static String getActionName() {
- return "Link unlinked DataMaps";
- }
-
- /**
- * Constructor for LinkDataMapsAction.
- *
- * @param application
- */
+
public LinkDataMapsAction(Application application) {
- super(getActionName(), application);
+ super("Link unlinked DataMaps", application);
}
@Override
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
index 9f934f396..f2cfbac07 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/LoadDbSchemaAction.java
@@ -19,11 +19,6 @@
package org.apache.cayenne.modeler.action;
-import javax.swing.JOptionPane;
-import javax.swing.tree.TreePath;
-import java.awt.event.ActionEvent;
-import java.sql.SQLException;
-
import org.apache.cayenne.dbsync.reverse.dbimport.Catalog;
import org.apache.cayenne.dbsync.reverse.dbimport.IncludeTable;
import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
@@ -40,6 +35,11 @@ import org.apache.cayenne.modeler.pref.DBConnectionInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.swing.*;
+import javax.swing.tree.TreePath;
+import java.awt.event.ActionEvent;
+import java.sql.SQLException;
+
/**
* @since 4.1
*/
@@ -61,10 +61,10 @@ public class LoadDbSchemaAction extends
DBConnectionAwareAction {
@Override
public void performAction(ActionEvent e) {
- performAction(e, null);
+ loadDbSchema(null);
}
- public void performAction(ActionEvent e, TreePath tablePath) {
+ public void loadDbSchema(TreePath tablePath) {
final DbImportView rootParent = ((DbImportView)
draggableTreePanel.getParent().getParent());
rootParent.getLoadDbSchemaProgress().setVisible(true);
rootParent.getLoadDbSchemaButton().setEnabled(false);
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java
index 61fcd2905..70d650122 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MigrateAction.java
@@ -29,19 +29,19 @@ import
org.apache.cayenne.modeler.dialog.db.merge.MergerOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import javax.swing.*;
import java.awt.event.ActionEvent;
import java.sql.Connection;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import javax.swing.JOptionPane;
/**
* Action that alter database schema to match a DataMap.
*/
public class MigrateAction extends DBConnectionAwareAction {
- private static Logger LOGGER =
LoggerFactory.getLogger(MigrateAction.class);
+ private static final Logger LOGGER =
LoggerFactory.getLogger(MigrateAction.class);
private boolean dialogShown;
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MultipleObjectsAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MultipleObjectsAction.java
index 9ca96fd9c..6c848346b 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MultipleObjectsAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/MultipleObjectsAction.java
@@ -22,11 +22,12 @@ import javax.swing.Action;
/**
* MultipleObjectsAction is an action, which can be applied to multiple
objects at once.
- * Therefore the name of the action might change
+ * Therefore, the name of the action might change
*/
public interface MultipleObjectsAction extends Action {
+
/**
- * @return The name for the action, either if one or multiple objects are
selected
+ * @return The name for the action, either if one or multiple objects are
selected
*/
- public String getActionName(boolean multiple);
+ String getActionName(boolean multiple);
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NavigateBackwardAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NavigateBackwardAction.java
index a5860a576..8618507bc 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NavigateBackwardAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NavigateBackwardAction.java
@@ -19,26 +19,17 @@
package org.apache.cayenne.modeler.action;
-import java.awt.event.ActionEvent;
-import java.util.EventObject;
-
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.CayenneAction;
-/**
- */
-public class NavigateBackwardAction extends CayenneAction {
+import java.awt.event.ActionEvent;
+import java.util.EventObject;
- public static final String getActionName() {
- return "Move Backward";
- }
+public class NavigateBackwardAction extends CayenneAction {
- /**
- * Constructor for Move Backward Action
- */
public NavigateBackwardAction(Application application) {
- super(getActionName(), application);
+ super("Move Backward", application);
}
public String getIconName() {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NavigateForwardAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NavigateForwardAction.java
index 1544a4ef0..787c27741 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NavigateForwardAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NavigateForwardAction.java
@@ -19,28 +19,20 @@
package org.apache.cayenne.modeler.action;
-import java.awt.event.ActionEvent;
-import java.util.EventObject;
-
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ProjectController;
import org.apache.cayenne.modeler.util.CayenneAction;
-/**
- */
-public class NavigateForwardAction extends CayenneAction {
+import java.awt.event.ActionEvent;
+import java.util.EventObject;
- public static final String getActionName() {
- return "Move Forward";
- }
+public class NavigateForwardAction extends CayenneAction {
- /**
- * Constructor for Move Forward Action
- */
public NavigateForwardAction(Application application) {
- super(getActionName(), application);
+ super("Move Forward", application);
}
+ @Override
public String getIconName() {
return "icon-forward.png";
}
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NewProjectAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NewProjectAction.java
index bb2950de9..9c9ab32c8 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NewProjectAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/NewProjectAction.java
@@ -34,22 +34,21 @@ import java.awt.event.KeyEvent;
public class NewProjectAction extends ProjectAction {
- public static String getActionName() {
- return "New Project";
- }
-
public NewProjectAction(Application application) {
- super(getActionName(), application);
+ super("New Project", application);
}
+ @Override
public String getIconName() {
return "icon-new.png";
}
+ @Override
public KeyStroke getAcceleratorKey() {
return KeyStroke.getKeyStroke(KeyEvent.VK_N,
Toolkit.getDefaultToolkit().getMenuShortcutKeyMaskEx());
}
+ @Override
public void performAction(ActionEvent e) {
CayenneModelerController controller = Application
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddPatternParamAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddPatternParamAction.java
index 02ae5e41a..e444a6ea6 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddPatternParamAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/AddPatternParamAction.java
@@ -31,7 +31,6 @@ import
org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
-import javax.swing.tree.TreePath;
import java.awt.event.ActionEvent;
/**
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DeleteNodeAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DeleteNodeAction.java
index 4093d9553..b296da1c0 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DeleteNodeAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/DeleteNodeAction.java
@@ -132,7 +132,7 @@ public class DeleteNodeAction extends
TreeManipulationAction {
rootParent.lockToolbarButtons();
for (TreePath path : paths) {
selectedElement = (DbImportTreeNode)
path.getLastPathComponent();
- parentElement = (DbImportTreeNode) selectedElement.getParent();
+ parentElement = selectedElement.getParent();
if (parentElement != null) {
Object parentUserObject = parentElement.getUserObject();
if (parentUserObject instanceof ReverseEngineering) {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/EditNodeAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/EditNodeAction.java
index a1e9ffc3a..c6d95d537 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/EditNodeAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/EditNodeAction.java
@@ -23,7 +23,6 @@ import
org.apache.cayenne.dbsync.reverse.dbimport.FilterContainer;
import org.apache.cayenne.dbsync.reverse.dbimport.PatternParam;
import org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
import org.apache.cayenne.modeler.editor.dbimport.DbImportSorter;
import org.apache.cayenne.util.Util;
@@ -63,7 +62,7 @@ public class EditNodeAction extends TreeManipulationAction {
}
if (tree.getSelectionPath() != null) {
selectedElement = tree.getSelectedNode();
- parentElement = (DbImportTreeNode) selectedElement.getParent();
+ parentElement = selectedElement.getParent();
if (parentElement != null) {
Object selectedObject = selectedElement.getUserObject();
ReverseEngineering reverseEngineeringOldCopy = new
ReverseEngineering(tree.getReverseEngineering());
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/ReverseEngineeringToolMenuAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/ReverseEngineeringToolMenuAction.java
index 39b44a158..7583b19bc 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/ReverseEngineeringToolMenuAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/ReverseEngineeringToolMenuAction.java
@@ -32,7 +32,6 @@ import java.awt.event.ActionEvent;
public class ReverseEngineeringToolMenuAction extends CayenneAction {
private static final String ACTION_NAME = "Reengineer Database Schema";
- private static final String DIALOG_TITLE = "Reverse Engineering";
public ReverseEngineeringToolMenuAction(Application application) {
super(ACTION_NAME, application);
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/TreeManipulationAction.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/TreeManipulationAction.java
index e3cbd9462..fa9afdbf6 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/TreeManipulationAction.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/dbimport/TreeManipulationAction.java
@@ -30,14 +30,13 @@ import
org.apache.cayenne.dbsync.reverse.dbimport.ReverseEngineering;
import org.apache.cayenne.dbsync.reverse.dbimport.Schema;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.dialog.db.load.DbImportTreeNode;
-import org.apache.cayenne.modeler.editor.dbimport.DbImportModel;
import org.apache.cayenne.modeler.editor.dbimport.DbImportTree;
import org.apache.cayenne.modeler.undo.DbImportTreeUndoableEdit;
import org.apache.cayenne.modeler.util.CayenneAction;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.swing.JTree;
+import javax.swing.*;
import javax.swing.tree.TreePath;
import java.util.ArrayList;
import java.util.Arrays;
@@ -184,7 +183,6 @@ public abstract class TreeManipulationAction extends
CayenneAction {
protected void updateModel(boolean updateSelected) {
insertableNodeName = null;
- DbImportModel model = (DbImportModel) tree.getModel();
getProjectController().setDirty(true);
TreePath savedPath = null;
if (!updateSelected) {
diff --git
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java
index b2262e071..a523b2e03 100644
---
a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java
+++
b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbimport/DbImportTree.java
@@ -346,7 +346,7 @@ public class DbImportTree extends JTree {
//reload tables and columns action.
LoadDbSchemaAction action =
Application.getInstance().getActionManager().getAction(LoadDbSchemaAction.class);
- action.performAction(null, path);
+ action.loadDbSchema(path);
}
}
diff --git
a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/DataMapEventTest.java
b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/DataMapEventTest.java
index f358a825d..3dba06741 100644
---
a/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/DataMapEventTest.java
+++
b/modeler/cayenne-modeler/src/test/java/org/apache/cayenne/modeler/event/DataMapEventTest.java
@@ -50,15 +50,5 @@ public class DataMapEventTest {
assertSame(d, e.getDataMap());
assertEquals("oldname", e.getOldName());
}
-
- @Test
- public void testDataMap() throws Exception {
- Object src = new Object();
- DataMap d = new DataMap("abc");
- DataMapEvent e = new DataMapEvent(src, null);
-
- e.setDataMap(d);
- assertSame(d, e.getDataMap());
- }
}
