You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2026/05/01 21:08:49 UTC
(cayenne) branch master updated (0ea038a15 -> bf9f87495)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
from 0ea038a15 Modeler cleanup
new 4d99f9935 Modeler cleanup
new bf9f87495 Modeler: Better-looking "Update Entity Class Name" dialog CAY-2927
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
RELEASE-NOTES.txt | 1 +
.../event/display/AttributeDisplayEvent.java | 52 -----
.../event/display/CallbackMethodDisplayEvent.java | 4 +-
.../event/display/CallbackTypeDisplayEvent.java | 10 +-
.../modeler/event/display/DataMapDisplayEvent.java | 54 +++--
.../event/display/DataNodeDisplayEvent.java | 16 +-
.../event/display/DbAttributeDisplayEvent.java | 69 +++++++
.../event/display/DbAttributeDisplayListener.java | 2 +-
...DisplayEvent.java => DbEntityDisplayEvent.java} | 48 +++--
.../event/display/DbEntityDisplayListener.java | 2 +-
.../event/display/DbRelationshipDisplayEvent.java | 69 +++++++
.../display/DbRelationshipDisplayListener.java | 6 +-
.../display/EmbeddableAttributeDisplayEvent.java | 42 +++-
.../event/display/EmbeddableDisplayEvent.java | 34 ++-
.../event/display/MultipleObjectsDisplayEvent.java | 14 +-
.../event/display/ObjAttributeDisplayEvent.java | 69 +++++++
.../event/display/ObjAttributeDisplayListener.java | 5 +-
...isplayEvent.java => ObjEntityDisplayEvent.java} | 48 +++--
.../event/display/ObjEntityDisplayListener.java | 6 +-
.../event/display/ObjRelationshipDisplayEvent.java | 69 +++++++
.../display/ObjRelationshipDisplayListener.java | 6 +-
.../event/display/ProcedureDisplayEvent.java | 35 +++-
.../display/ProcedureParameterDisplayEvent.java | 59 +++---
.../modeler/event/display/QueryDisplayEvent.java | 21 +-
.../event/display/RelationshipDisplayEvent.java | 56 -----
.../display/ValidationConfigDisplayEvent.java | 10 +-
.../cayenne/modeler/pref/ProjectSelectionMemo.java | 230 +++++++++++++--------
.../modeler/ui/action/BaseViewEntityAction.java | 15 +-
.../modeler/ui/action/CreateAttributeAction.java | 14 +-
.../modeler/ui/action/CreateDataMapAction.java | 3 +-
.../modeler/ui/action/CreateDbEntityAction.java | 15 +-
.../modeler/ui/action/CreateEmbeddableAction.java | 6 +-
.../modeler/ui/action/CreateObjEntityAction.java | 15 +-
.../modeler/ui/action/CreateProcedureAction.java | 9 +-
.../ui/action/CreateProcedureParameterAction.java | 7 +-
.../modeler/ui/action/CreateQueryAction.java | 2 +-
.../ui/action/CreateRelationshipAction.java | 11 +-
.../cayenne/modeler/ui/action/FindAction.java | 75 ++++---
.../modeler/ui/action/ImportEOModelAction.java | 2 +-
.../modeler/ui/action/ObjEntitySyncAction.java | 8 +-
.../DbRelationshipDialogController.java | 10 +-
.../modeler/ui/project/ProjectController.java | 27 ++-
.../ui/project/ProjectNavigationHistory.java | 24 +--
.../project/editor/datadomain/DataDomainView.java | 28 ++-
.../datadomain/cgen/DataDomainCgenController.java | 2 +-
.../dbimport/DataDomainDbImportController.java | 2 +-
.../datadomain/graph/DataDomainGraphTab.java | 61 ++++--
.../graph/action/ShowGraphEntityAction.java | 21 +-
.../ui/project/editor/dbentity/DbEntityView.java | 47 ++---
.../editor/dbentity/main/DbEntityMainView.java | 12 +-
.../dbentity/properties/DbAttributePanel.java | 16 +-
.../properties/DbEntityPropertiesView.java | 6 +-
.../dbentity/properties/DbRelationshipPanel.java | 16 +-
.../attributes/EmbeddableAttributesView.java | 6 +-
.../ui/project/editor/objentity/ObjEntityView.java | 49 ++---
.../attrinfo/ObjAttributeInfoDialogController.java | 14 +-
.../classname/ClassNameUpdaterController.java | 65 +++---
.../objentity/classname/ClassNameUpdaterView.java | 75 -------
.../editor/objentity/main/ObjEntityMainView.java | 19 +-
.../objentity/properties/ObjAttributePanel.java | 16 +-
.../properties/ObjAttributeTableModel.java | 18 +-
.../properties/ObjEntityPropertiesView.java | 4 +-
.../objentity/properties/ObjRelationshipPanel.java | 16 +-
.../relinfo/ObjRelationshipInfoController.java | 10 +-
.../editor/procedure/ProcedureParameterTab.java | 6 +-
.../ui/project/editor/procedure/ProcedureTab.java | 6 +-
.../ui/project/querytype/QueryTypeController.java | 5 +-
.../ui/project/tree/ProjectTreeController.java | 76 +++----
.../ui/project/validator/AttributeErrorMsg.java | 21 +-
.../ui/project/validator/DataMapErrorMsg.java | 2 +-
.../validator/EmbeddableAttributeErrorMsg.java | 13 +-
.../ui/project/validator/EmbeddableErrorMsg.java | 4 +-
.../ui/project/validator/EntityErrorMsg.java | 13 +-
.../ui/project/validator/ProcedureErrorMsg.java | 6 +-
.../validator/ProcedureParameterErrorMsg.java | 13 +-
.../ui/project/validator/QueryErrorMsg.java | 2 +-
.../ui/project/validator/RelationshipErrorMsg.java | 30 ++-
.../undo/BaseRemovePropertyUndoableEdit.java | 4 +-
.../undo/ChangePKGeneratorUndoableEdit.java | 6 +-
.../modeler/undo/CreateAttributeUndoableEdit.java | 15 +-
.../undo/CreateProcedureParameterUndoableEdit.java | 2 +-
.../undo/CreateRelationshipUndoableEdit.java | 15 +-
82 files changed, 1156 insertions(+), 866 deletions(-)
delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/AttributeDisplayEvent.java
create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java
copy modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/{EntityDisplayEvent.java => DbEntityDisplayEvent.java} (53%)
create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java
create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java
rename modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/{EntityDisplayEvent.java => ObjEntityDisplayEvent.java} (53%)
create mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java
delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/RelationshipDisplayEvent.java
delete mode 100644 modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterView.java
(cayenne) 02/02: Modeler: Better-looking "Update Entity Class Name" dialog CAY-2927
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit bf9f87495d901b31f7ddfb0bfcf6c8754d3c0167
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri May 1 17:07:10 2026 -0400
Modeler: Better-looking "Update Entity Class Name" dialog CAY-2927
---
RELEASE-NOTES.txt | 1 +
.../classname/ClassNameUpdaterController.java | 65 +++++++------------
.../objentity/classname/ClassNameUpdaterView.java | 75 ----------------------
3 files changed, 25 insertions(+), 116 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 2bb00caee..50d0b8ed0 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -28,6 +28,7 @@ CAY-2920 Remove "Reengineer Database Schema" menu
CAY-2922 Modeler: remove support for upgrading from file-based preferences
CAY-2923 Modeler: Restore table cell editor borders
CAY-2924 Move MapEvent and subclasses from the core to the Modeler
+CAY-2927 Modeler: Better-looking "Update Entity Class Name" dialog
Bug Fixes:
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterController.java
index 4364e853f..0c3a93779 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterController.java
@@ -25,61 +25,54 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.cayenne.modeler.mvc.RootController;
-import java.awt.*;
+import javax.swing.JOptionPane;
+import java.awt.Component;
public class ClassNameUpdaterController extends ChildController<RootController> {
+ private static final String UPDATE = "Update";
+ private static final String CANCEL = "Cancel";
+
private final ObjEntity entity;
- private ClassNameUpdaterView view;
- private boolean updatePerformed;
public ClassNameUpdaterController(RootController parent, ObjEntity entity) {
super(parent);
-
this.entity = entity;
-
- // don't init view here... we may simply skip update if there is nothing to do
}
/**
* Executes entity class name update. Returns true if entity was changed, false otherwise.
*/
public boolean doNameUpdate() {
- this.view = null;
- this.updatePerformed = false;
-
- boolean askForUpdate = true;
-
String oldName = entity.getClassName();
String suggestedName = suggestedClassName();
if (oldName == null || oldName.isEmpty()) {
// generic entity...
- askForUpdate = false;
- } else if (suggestedName == null || suggestedName.equals(oldName)) {
- askForUpdate = false;
- } else if (oldName.contains("UntitledObjEntity")) {
+ return false;
+ }
+ if (suggestedName == null || suggestedName.equals(oldName)) {
+ return false;
+ }
+ if (oldName.contains("UntitledObjEntity")) {
// update without user interaction
entity.setClassName(suggestedName);
- updatePerformed = true;
- askForUpdate = false;
+ return true;
}
- if (askForUpdate) {
- // start dialog
- view = new ClassNameUpdaterView();
- view.getClassName().setText("Update class name to " + suggestedName + " to match current entity name?");
+ JOptionPane pane = new JOptionPane(
+ "Update class name to '" + suggestedName + "' to match the current entity name?",
+ JOptionPane.QUESTION_MESSAGE);
+ pane.setOptions(new Object[]{UPDATE, CANCEL});
+ pane.setInitialValue(UPDATE);
- initBindings(suggestedName);
+ pane.createDialog(parent.getView(), "Update Class Name").setVisible(true);
- view.pack();
- view.setModal(true);
- centerView();
- makeCloseableOnEscape();
- view.setVisible(true);
+ if (UPDATE.equals(pane.getValue())) {
+ entity.setClassName(suggestedName);
+ return true;
}
-
- return this.updatePerformed;
+ return false;
}
private String suggestedClassName() {
@@ -111,18 +104,8 @@ public class ClassNameUpdaterController extends ChildController<RootController>
return DataMap.getNameWithPackage(pkg, entityName);
}
- protected void initBindings(final String suggestedName) {
-
- view.getUpdateButton().addActionListener(e -> {
- entity.setClassName(suggestedName);
- updatePerformed = true;
- view.dispose();
- });
-
- view.getCancelButton().addActionListener(e -> view.dispose());
- }
-
+ @Override
public Component getView() {
- return view;
+ return null;
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterView.java
deleted file mode 100644
index 4da5f011b..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/classname/ClassNameUpdaterView.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-package org.apache.cayenne.modeler.ui.project.editor.objentity.classname;
-
-import com.jgoodies.forms.builder.DefaultFormBuilder;
-import com.jgoodies.forms.layout.FormLayout;
-
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import java.awt.BorderLayout;
-import java.awt.Container;
-import java.awt.FlowLayout;
-
-public class ClassNameUpdaterView extends JDialog {
-
- private final JLabel className;
- private final JButton updateButton;
- private final JButton cancelButton;
-
- public ClassNameUpdaterView() {
- className = new JLabel("Update class name to _______________________ to match current entity name?");
- updateButton = new JButton("Update");
- cancelButton = new JButton("Cancel");
-
- getRootPane().setDefaultButton(updateButton);
-
- // assemble
- FormLayout layout = new FormLayout("left:200dlu", "");
- DefaultFormBuilder builder = new DefaultFormBuilder(layout);
- builder.setDefaultDialogBorder();
- builder.append(className);
-
- JPanel buttons = new JPanel(new FlowLayout(FlowLayout.RIGHT));
- buttons.add(cancelButton);
- buttons.add(updateButton);
-
- Container contentPane = getContentPane();
- contentPane.setLayout(new BorderLayout());
- contentPane.add(className, BorderLayout.CENTER);
- contentPane.add(buttons, BorderLayout.SOUTH);
-
- setTitle("Update Entity Class Name");
- }
-
- public JLabel getClassName() {
- return className;
- }
-
- public JButton getCancelButton() {
- return cancelButton;
- }
-
- public JButton getUpdateButton() {
- return updateButton;
- }
-}
(cayenne) 01/02: Modeler cleanup
Posted by aa...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
commit 4d99f9935618d44c1655ac5c320a7fb23ff5edcd
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Fri May 1 10:50:49 2026 -0400
Modeler cleanup
display events cleanup
---
.../event/display/AttributeDisplayEvent.java | 52 -----
.../event/display/CallbackMethodDisplayEvent.java | 4 +-
.../event/display/CallbackTypeDisplayEvent.java | 10 +-
.../modeler/event/display/DataMapDisplayEvent.java | 54 +++--
.../event/display/DataNodeDisplayEvent.java | 16 +-
.../event/display/DbAttributeDisplayEvent.java | 69 +++++++
.../event/display/DbAttributeDisplayListener.java | 2 +-
...DisplayEvent.java => DbEntityDisplayEvent.java} | 48 +++--
.../event/display/DbEntityDisplayListener.java | 2 +-
.../event/display/DbRelationshipDisplayEvent.java | 69 +++++++
.../display/DbRelationshipDisplayListener.java | 6 +-
.../display/EmbeddableAttributeDisplayEvent.java | 42 +++-
.../event/display/EmbeddableDisplayEvent.java | 34 ++-
.../event/display/MultipleObjectsDisplayEvent.java | 14 +-
.../event/display/ObjAttributeDisplayEvent.java | 69 +++++++
.../event/display/ObjAttributeDisplayListener.java | 5 +-
...isplayEvent.java => ObjEntityDisplayEvent.java} | 48 +++--
.../event/display/ObjEntityDisplayListener.java | 6 +-
.../event/display/ObjRelationshipDisplayEvent.java | 69 +++++++
.../display/ObjRelationshipDisplayListener.java | 6 +-
.../event/display/ProcedureDisplayEvent.java | 35 +++-
.../display/ProcedureParameterDisplayEvent.java | 59 +++---
.../modeler/event/display/QueryDisplayEvent.java | 21 +-
.../event/display/RelationshipDisplayEvent.java | 56 -----
.../display/ValidationConfigDisplayEvent.java | 10 +-
.../cayenne/modeler/pref/ProjectSelectionMemo.java | 230 +++++++++++++--------
.../modeler/ui/action/BaseViewEntityAction.java | 15 +-
.../modeler/ui/action/CreateAttributeAction.java | 14 +-
.../modeler/ui/action/CreateDataMapAction.java | 3 +-
.../modeler/ui/action/CreateDbEntityAction.java | 15 +-
.../modeler/ui/action/CreateEmbeddableAction.java | 6 +-
.../modeler/ui/action/CreateObjEntityAction.java | 15 +-
.../modeler/ui/action/CreateProcedureAction.java | 9 +-
.../ui/action/CreateProcedureParameterAction.java | 7 +-
.../modeler/ui/action/CreateQueryAction.java | 2 +-
.../ui/action/CreateRelationshipAction.java | 11 +-
.../cayenne/modeler/ui/action/FindAction.java | 75 ++++---
.../modeler/ui/action/ImportEOModelAction.java | 2 +-
.../modeler/ui/action/ObjEntitySyncAction.java | 8 +-
.../DbRelationshipDialogController.java | 10 +-
.../modeler/ui/project/ProjectController.java | 27 ++-
.../ui/project/ProjectNavigationHistory.java | 24 +--
.../project/editor/datadomain/DataDomainView.java | 28 ++-
.../datadomain/cgen/DataDomainCgenController.java | 2 +-
.../dbimport/DataDomainDbImportController.java | 2 +-
.../datadomain/graph/DataDomainGraphTab.java | 61 ++++--
.../graph/action/ShowGraphEntityAction.java | 21 +-
.../ui/project/editor/dbentity/DbEntityView.java | 47 ++---
.../editor/dbentity/main/DbEntityMainView.java | 12 +-
.../dbentity/properties/DbAttributePanel.java | 16 +-
.../properties/DbEntityPropertiesView.java | 6 +-
.../dbentity/properties/DbRelationshipPanel.java | 16 +-
.../attributes/EmbeddableAttributesView.java | 6 +-
.../ui/project/editor/objentity/ObjEntityView.java | 49 ++---
.../attrinfo/ObjAttributeInfoDialogController.java | 14 +-
.../editor/objentity/main/ObjEntityMainView.java | 19 +-
.../objentity/properties/ObjAttributePanel.java | 16 +-
.../properties/ObjAttributeTableModel.java | 18 +-
.../properties/ObjEntityPropertiesView.java | 4 +-
.../objentity/properties/ObjRelationshipPanel.java | 16 +-
.../relinfo/ObjRelationshipInfoController.java | 10 +-
.../editor/procedure/ProcedureParameterTab.java | 6 +-
.../ui/project/editor/procedure/ProcedureTab.java | 6 +-
.../ui/project/querytype/QueryTypeController.java | 5 +-
.../ui/project/tree/ProjectTreeController.java | 76 +++----
.../ui/project/validator/AttributeErrorMsg.java | 21 +-
.../ui/project/validator/DataMapErrorMsg.java | 2 +-
.../validator/EmbeddableAttributeErrorMsg.java | 13 +-
.../ui/project/validator/EmbeddableErrorMsg.java | 4 +-
.../ui/project/validator/EntityErrorMsg.java | 13 +-
.../ui/project/validator/ProcedureErrorMsg.java | 6 +-
.../validator/ProcedureParameterErrorMsg.java | 13 +-
.../ui/project/validator/QueryErrorMsg.java | 2 +-
.../ui/project/validator/RelationshipErrorMsg.java | 30 ++-
.../undo/BaseRemovePropertyUndoableEdit.java | 4 +-
.../undo/ChangePKGeneratorUndoableEdit.java | 6 +-
.../modeler/undo/CreateAttributeUndoableEdit.java | 15 +-
.../undo/CreateProcedureParameterUndoableEdit.java | 2 +-
.../undo/CreateRelationshipUndoableEdit.java | 15 +-
79 files changed, 1131 insertions(+), 750 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/AttributeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/AttributeDisplayEvent.java
deleted file mode 100644
index e120de61f..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/AttributeDisplayEvent.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package org.apache.cayenne.modeler.event.display;
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.map.Attribute;
-import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.Entity;
-
-public class AttributeDisplayEvent extends EntityDisplayEvent {
-
- protected final Attribute<?,?,?>[] attributes;
-
- public AttributeDisplayEvent(
- Object src,
- Attribute<?,?,?> attribute,
- Entity<?,?,?> entity,
- DataMap dataMap,
- DataChannelDescriptor domain) {
- this(src, new Attribute[]{attribute}, entity, dataMap, domain);
- }
-
- public AttributeDisplayEvent(
- Object src,
- Attribute<?,?,?>[] attributes,
- Entity<?,?,?> entity,
- DataMap dataMap,
- DataChannelDescriptor domain) {
- super(src, entity, dataMap, domain);
- this.attributes = attributes;
- }
-
- public Attribute<?,?,?>[] getAttributes() {
- return attributes;
- }
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java
index b9dbe1fd4..0b2a1c51b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackMethodDisplayEvent.java
@@ -20,9 +20,7 @@ package org.apache.cayenne.modeler.event.display;
import org.apache.cayenne.modeler.ui.project.editor.objentity.callbacks.ObjCallbackMethod;
-import java.util.EventObject;
-
-public class CallbackMethodDisplayEvent extends EventObject {
+public class CallbackMethodDisplayEvent extends DisplayEvent {
private final ObjCallbackMethod[] callbackMethods;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeDisplayEvent.java
index 5cf9d1447..ae36249b1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/CallbackTypeDisplayEvent.java
@@ -18,15 +18,14 @@
****************************************************************/
package org.apache.cayenne.modeler.event.display;
-import org.apache.cayenne.event.CayenneEvent;
import org.apache.cayenne.modeler.ui.project.editor.objentity.callbacks.CallbackType;
-public class CallbackTypeDisplayEvent extends CayenneEvent {
+public class CallbackTypeDisplayEvent extends DisplayEvent {
- private CallbackType callbackType;
+ private final CallbackType callbackType;
- public CallbackTypeDisplayEvent(Object source, CallbackType callbackType) {
- super(source);
+ public CallbackTypeDisplayEvent(Object src, CallbackType callbackType) {
+ super(src);
this.callbackType = callbackType;
}
@@ -34,4 +33,3 @@ public class CallbackTypeDisplayEvent extends CayenneEvent {
return callbackType;
}
}
-
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayEvent.java
index 39e0e3611..56a0843b5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataMapDisplayEvent.java
@@ -1,4 +1,3 @@
-package org.apache.cayenne.modeler.event.display;
/*****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,41 +17,60 @@ package org.apache.cayenne.modeler.event.display;
* under the License.
****************************************************************/
+package org.apache.cayenne.modeler.event.display;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.map.DataMap;
-public class DataMapDisplayEvent extends DataNodeDisplayEvent {
-
- protected final DataMap dataMap;
+public class DataMapDisplayEvent extends DisplayEvent {
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final DataNodeDescriptor dataNode;
// True if the event should cause the editor to switch to the main DataMap tab
- protected boolean mainTabFocus;
+ private final boolean mainTabFocus;
+
+ public DataMapDisplayEvent(Object src, DataChannelDescriptor domain, DataMap dataMap) {
+ this(src, domain, dataMap, null, false);
+ }
+
+ public DataMapDisplayEvent(Object src, DataChannelDescriptor domain, DataMap dataMap, boolean mainTabFocus) {
+ this(src, domain, dataMap, null, mainTabFocus);
+ }
- public DataMapDisplayEvent(Object src, DataMap map, DataChannelDescriptor dataChannelDescriptor) {
- this(src, map, dataChannelDescriptor, null);
+ public DataMapDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ DataNodeDescriptor dataNode) {
+ this(src, domain, dataMap, dataNode, false);
}
- public DataMapDisplayEvent(
- Object src,
- DataMap map,
- DataChannelDescriptor dataChannelDescriptor,
- DataNodeDescriptor node) {
+ public DataMapDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ DataNodeDescriptor dataNode,
+ boolean mainTabFocus) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
+ this.dataNode = dataNode;
+ this.mainTabFocus = mainTabFocus;
+ }
- super(src, dataChannelDescriptor, node);
- this.dataMap = map;
+ public DataChannelDescriptor getDomain() {
+ return domain;
}
public DataMap getDataMap() {
return dataMap;
}
- public boolean isMainTabFocus() {
- return mainTabFocus;
+ public DataNodeDescriptor getDataNode() {
+ return dataNode;
}
- public void setMainTabFocus(boolean mainTabFocus) {
- this.mainTabFocus = mainTabFocus;
+ public boolean isMainTabFocus() {
+ return mainTabFocus;
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataNodeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataNodeDisplayEvent.java
index 58ae0f3a5..fe336fe43 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataNodeDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DataNodeDisplayEvent.java
@@ -22,13 +22,19 @@ package org.apache.cayenne.modeler.event.display;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-public class DataNodeDisplayEvent extends DomainDisplayEvent {
+public class DataNodeDisplayEvent extends DisplayEvent {
- protected final DataNodeDescriptor dataNode;
+ private final DataChannelDescriptor domain;
+ private final DataNodeDescriptor dataNode;
- public DataNodeDisplayEvent(Object src, DataChannelDescriptor dataChannelDescriptor, DataNodeDescriptor node) {
- super(src, dataChannelDescriptor);
- this.dataNode = node;
+ public DataNodeDisplayEvent(Object src, DataChannelDescriptor domain, DataNodeDescriptor dataNode) {
+ super(src);
+ this.domain = domain;
+ this.dataNode = dataNode;
+ }
+
+ public DataChannelDescriptor getDomain() {
+ return domain;
}
public DataNodeDescriptor getDataNode() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java
new file mode 100644
index 000000000..0e27738af
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayEvent.java
@@ -0,0 +1,69 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.event.display;
+
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbAttribute;
+import org.apache.cayenne.map.DbEntity;
+
+public class DbAttributeDisplayEvent extends DisplayEvent {
+
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final DbEntity entity;
+ private final DbAttribute[] attributes;
+
+ public DbAttributeDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ DbEntity entity,
+ DbAttribute attribute) {
+ this(src, domain, dataMap, entity, new DbAttribute[]{attribute});
+ }
+
+ public DbAttributeDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ DbEntity entity,
+ DbAttribute[] attributes) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
+ this.entity = entity;
+ this.attributes = attributes;
+ }
+
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ public DbEntity getEntity() {
+ return entity;
+ }
+
+ public DbAttribute[] getAttributes() {
+ return attributes;
+ }
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayListener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayListener.java
index 0c37e757c..44a59c57f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayListener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbAttributeDisplayListener.java
@@ -24,5 +24,5 @@ import java.util.EventListener;
public interface DbAttributeDisplayListener extends EventListener {
- void dbAttributeSelected(AttributeDisplayEvent e);
+ void dbAttributeSelected(DbAttributeDisplayEvent e);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EntityDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayEvent.java
similarity index 53%
copy from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EntityDisplayEvent.java
copy to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayEvent.java
index fbd07d08d..44226dc77 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EntityDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayEvent.java
@@ -20,38 +20,52 @@
package org.apache.cayenne.modeler.event.display;
import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.DbEntity;
-public class EntityDisplayEvent extends DataMapDisplayEvent {
+public class DbEntityDisplayEvent extends DisplayEvent {
- protected final Entity<?, ?, ?> entity;
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final DbEntity entity;
+ private final boolean mainTabFocus;
+ private final boolean unselectAttributes;
- protected boolean unselectAttributes;
+ public DbEntityDisplayEvent(Object src, DataChannelDescriptor domain, DataMap dataMap, DbEntity entity) {
+ this(src, domain, dataMap, entity, false, false);
+ }
- public EntityDisplayEvent(Object src, Entity<?, ?, ?> entity) {
- this(src, entity, null, null, null);
+ public DbEntityDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ DbEntity entity,
+ boolean mainTabFocus,
+ boolean unselectAttributes) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
+ this.entity = entity;
+ this.mainTabFocus = mainTabFocus;
+ this.unselectAttributes = unselectAttributes;
}
- public EntityDisplayEvent(Object src, Entity<?, ?, ?> entity, DataMap map, DataChannelDescriptor dataChannelDescriptor) {
- this(src, entity, map, null, dataChannelDescriptor);
+ public DataChannelDescriptor getDomain() {
+ return domain;
}
- public EntityDisplayEvent(Object src, Entity<?, ?, ?> entity, DataMap map, DataNodeDescriptor node, DataChannelDescriptor dataChannelDescriptor) {
- super(src, map, dataChannelDescriptor, node);
- this.entity = entity;
+ public DataMap getDataMap() {
+ return dataMap;
}
- public Entity<?, ?, ?> getEntity() {
+ public DbEntity getEntity() {
return entity;
}
- public boolean isUnselectAttributes() {
- return unselectAttributes;
+ public boolean isMainTabFocus() {
+ return mainTabFocus;
}
- public void setUnselectAttributes(boolean unselectAttributes) {
- this.unselectAttributes = unselectAttributes;
+ public boolean isUnselectAttributes() {
+ return unselectAttributes;
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayListener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayListener.java
index 78bb026a7..22973a198 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayListener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbEntityDisplayListener.java
@@ -23,5 +23,5 @@ import java.util.EventListener;
public interface DbEntityDisplayListener extends EventListener {
- void dbEntitySelected(EntityDisplayEvent e);
+ void dbEntitySelected(DbEntityDisplayEvent e);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java
new file mode 100644
index 000000000..8b05528a0
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayEvent.java
@@ -0,0 +1,69 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.event.display;
+
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbRelationship;
+
+public class DbRelationshipDisplayEvent extends DisplayEvent {
+
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final DbEntity entity;
+ private final DbRelationship[] relationships;
+
+ public DbRelationshipDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ DbEntity entity,
+ DbRelationship relationship) {
+ this(src, domain, dataMap, entity, new DbRelationship[]{relationship});
+ }
+
+ public DbRelationshipDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ DbEntity entity,
+ DbRelationship[] relationships) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
+ this.entity = entity;
+ this.relationships = relationships;
+ }
+
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ public DbEntity getEntity() {
+ return entity;
+ }
+
+ public DbRelationship[] getRelationships() {
+ return relationships;
+ }
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayListener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayListener.java
index 6910567ce..938a012e1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayListener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/DbRelationshipDisplayListener.java
@@ -1,4 +1,3 @@
-package org.apache.cayenne.modeler.event.display;
/*****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,10 +16,11 @@ package org.apache.cayenne.modeler.event.display;
* specific language governing permissions and limitations
* under the License.
****************************************************************/
+package org.apache.cayenne.modeler.event.display;
+
import java.util.EventListener;
public interface DbRelationshipDisplayListener extends EventListener {
- void dbRelationshipSelected(RelationshipDisplayEvent e);
+ void dbRelationshipSelected(DbRelationshipDisplayEvent e);
}
-
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
index ee94a44aa..a2d133c83 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableAttributeDisplayEvent.java
@@ -23,22 +23,46 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.EmbeddableAttribute;
-public class EmbeddableAttributeDisplayEvent extends EmbeddableDisplayEvent {
+public class EmbeddableAttributeDisplayEvent extends DisplayEvent {
- protected final EmbeddableAttribute[] embeddableAttributes;
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final Embeddable embeddable;
+ private final EmbeddableAttribute[] embeddableAttributes;
- public EmbeddableAttributeDisplayEvent(Object src, Embeddable embeddable, EmbeddableAttribute attr, DataMap dataMap, DataChannelDescriptor domain) {
- super(src, embeddable, dataMap, domain);
- embeddableAttributes = new EmbeddableAttribute[]{attr};
+ public EmbeddableAttributeDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ Embeddable embeddable,
+ EmbeddableAttribute attribute) {
+ this(src, domain, dataMap, embeddable, new EmbeddableAttribute[]{attribute});
}
- public EmbeddableAttributeDisplayEvent(Object src, Embeddable embeddable, EmbeddableAttribute[] attr, DataMap dataMap, DataChannelDescriptor domain) {
- super(src, embeddable, dataMap, domain);
- this.embeddableAttributes = attr;
+ public EmbeddableAttributeDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ Embeddable embeddable,
+ EmbeddableAttribute[] attributes) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
+ this.embeddable = embeddable;
+ this.embeddableAttributes = attributes;
+ }
+
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ public Embeddable getEmbeddable() {
+ return embeddable;
}
public EmbeddableAttribute[] getEmbeddableAttributes() {
return embeddableAttributes;
}
-
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayEvent.java
index 1dcac806c..6762c1e3b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EmbeddableDisplayEvent.java
@@ -22,16 +22,42 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Embeddable;
-public class EmbeddableDisplayEvent extends DataMapDisplayEvent {
+public class EmbeddableDisplayEvent extends DisplayEvent {
- protected final Embeddable embeddable;
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final Embeddable embeddable;
+ private final boolean mainTabFocus;
- public EmbeddableDisplayEvent(Object src, Embeddable embeddable, DataMap dataMap, DataChannelDescriptor dataChannelDescriptor) {
- super(src, dataMap, dataChannelDescriptor);
+ public EmbeddableDisplayEvent(Object src, DataChannelDescriptor domain, DataMap dataMap, Embeddable embeddable) {
+ this(src, domain, dataMap, embeddable, false);
+ }
+
+ public EmbeddableDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ Embeddable embeddable,
+ boolean mainTabFocus) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
this.embeddable = embeddable;
+ this.mainTabFocus = mainTabFocus;
+ }
+
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
}
public Embeddable getEmbeddable() {
return embeddable;
}
+
+ public boolean isMainTabFocus() {
+ return mainTabFocus;
+ }
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java
index 8e7d786ed..f64cfeafc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/MultipleObjectsDisplayEvent.java
@@ -20,20 +20,18 @@ package org.apache.cayenne.modeler.event.display;
import org.apache.cayenne.configuration.ConfigurationNode;
-import java.util.EventObject;
-
/**
* Display event for several selected objects
*/
-public class MultipleObjectsDisplayEvent extends EventObject {
+public class MultipleObjectsDisplayEvent extends DisplayEvent {
- private ConfigurationNode[] nodes;
- private ConfigurationNode parentNode;
+ private final ConfigurationNode[] nodes;
+ private final ConfigurationNode parentNode;
- public MultipleObjectsDisplayEvent(Object src, ConfigurationNode[] objects, ConfigurationNode parentObject) {
+ public MultipleObjectsDisplayEvent(Object src, ConfigurationNode[] nodes, ConfigurationNode parentNode) {
super(src);
- this.nodes = objects;
- this.parentNode = parentObject;
+ this.nodes = nodes;
+ this.parentNode = parentNode;
}
public ConfigurationNode[] getNodes() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java
new file mode 100644
index 000000000..74a67dcbb
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayEvent.java
@@ -0,0 +1,69 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.event.display;
+
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.ObjAttribute;
+import org.apache.cayenne.map.ObjEntity;
+
+public class ObjAttributeDisplayEvent extends DisplayEvent {
+
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final ObjEntity entity;
+ private final ObjAttribute[] attributes;
+
+ public ObjAttributeDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ ObjEntity entity,
+ ObjAttribute attribute) {
+ this(src, domain, dataMap, entity, new ObjAttribute[]{attribute});
+ }
+
+ public ObjAttributeDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ ObjEntity entity,
+ ObjAttribute[] attributes) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
+ this.entity = entity;
+ this.attributes = attributes;
+ }
+
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ public ObjEntity getEntity() {
+ return entity;
+ }
+
+ public ObjAttribute[] getAttributes() {
+ return attributes;
+ }
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayListener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayListener.java
index 374491580..c3cad7465 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayListener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjAttributeDisplayListener.java
@@ -1,4 +1,3 @@
-package org.apache.cayenne.modeler.event.display;
/*****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,8 +16,10 @@ package org.apache.cayenne.modeler.event.display;
* specific language governing permissions and limitations
* under the License.
****************************************************************/
+package org.apache.cayenne.modeler.event.display;
+
import java.util.EventListener;
public interface ObjAttributeDisplayListener extends EventListener {
- void objAttributeSelected(AttributeDisplayEvent e);
+ void objAttributeSelected(ObjAttributeDisplayEvent e);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EntityDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayEvent.java
similarity index 53%
rename from modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EntityDisplayEvent.java
rename to modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayEvent.java
index fbd07d08d..3b619657c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/EntityDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayEvent.java
@@ -20,38 +20,52 @@
package org.apache.cayenne.modeler.event.display;
import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.configuration.DataNodeDescriptor;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.ObjEntity;
-public class EntityDisplayEvent extends DataMapDisplayEvent {
+public class ObjEntityDisplayEvent extends DisplayEvent {
- protected final Entity<?, ?, ?> entity;
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final ObjEntity entity;
+ private final boolean mainTabFocus;
+ private final boolean unselectAttributes;
- protected boolean unselectAttributes;
+ public ObjEntityDisplayEvent(Object src, DataChannelDescriptor domain, DataMap dataMap, ObjEntity entity) {
+ this(src, domain, dataMap, entity, false, false);
+ }
- public EntityDisplayEvent(Object src, Entity<?, ?, ?> entity) {
- this(src, entity, null, null, null);
+ public ObjEntityDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ ObjEntity entity,
+ boolean mainTabFocus,
+ boolean unselectAttributes) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
+ this.entity = entity;
+ this.mainTabFocus = mainTabFocus;
+ this.unselectAttributes = unselectAttributes;
}
- public EntityDisplayEvent(Object src, Entity<?, ?, ?> entity, DataMap map, DataChannelDescriptor dataChannelDescriptor) {
- this(src, entity, map, null, dataChannelDescriptor);
+ public DataChannelDescriptor getDomain() {
+ return domain;
}
- public EntityDisplayEvent(Object src, Entity<?, ?, ?> entity, DataMap map, DataNodeDescriptor node, DataChannelDescriptor dataChannelDescriptor) {
- super(src, map, dataChannelDescriptor, node);
- this.entity = entity;
+ public DataMap getDataMap() {
+ return dataMap;
}
- public Entity<?, ?, ?> getEntity() {
+ public ObjEntity getEntity() {
return entity;
}
- public boolean isUnselectAttributes() {
- return unselectAttributes;
+ public boolean isMainTabFocus() {
+ return mainTabFocus;
}
- public void setUnselectAttributes(boolean unselectAttributes) {
- this.unselectAttributes = unselectAttributes;
+ public boolean isUnselectAttributes() {
+ return unselectAttributes;
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayListener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayListener.java
index 542a38a27..84292a434 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayListener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjEntityDisplayListener.java
@@ -1,4 +1,3 @@
-package org.apache.cayenne.modeler.event.display;
/*****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,10 +16,11 @@ package org.apache.cayenne.modeler.event.display;
* specific language governing permissions and limitations
* under the License.
****************************************************************/
+package org.apache.cayenne.modeler.event.display;
+
import java.util.EventListener;
public interface ObjEntityDisplayListener extends EventListener {
- void objEntitySelected(EntityDisplayEvent e);
+ void objEntitySelected(ObjEntityDisplayEvent e);
}
-
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java
new file mode 100644
index 000000000..d8a43142f
--- /dev/null
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayEvent.java
@@ -0,0 +1,69 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ ****************************************************************/
+
+package org.apache.cayenne.modeler.event.display;
+
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjRelationship;
+
+public class ObjRelationshipDisplayEvent extends DisplayEvent {
+
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final ObjEntity entity;
+ private final ObjRelationship[] relationships;
+
+ public ObjRelationshipDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ ObjEntity entity,
+ ObjRelationship relationship) {
+ this(src, domain, dataMap, entity, new ObjRelationship[]{relationship});
+ }
+
+ public ObjRelationshipDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ ObjEntity entity,
+ ObjRelationship[] relationships) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
+ this.entity = entity;
+ this.relationships = relationships;
+ }
+
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ public ObjEntity getEntity() {
+ return entity;
+ }
+
+ public ObjRelationship[] getRelationships() {
+ return relationships;
+ }
+}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayListener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayListener.java
index a60363cbb..e6e1acdfc 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayListener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ObjRelationshipDisplayListener.java
@@ -1,4 +1,3 @@
-package org.apache.cayenne.modeler.event.display;
/*****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -17,7 +16,7 @@ package org.apache.cayenne.modeler.event.display;
* specific language governing permissions and limitations
* under the License.
****************************************************************/
-
+package org.apache.cayenne.modeler.event.display;
import java.util.EventListener;
@@ -26,6 +25,5 @@ import java.util.EventListener;
*/
public interface ObjRelationshipDisplayListener extends EventListener {
- void currentObjRelationshipChanged(RelationshipDisplayEvent e);
+ void currentObjRelationshipChanged(ObjRelationshipDisplayEvent e);
}
-
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayEvent.java
index eed8e5b26..926c5e100 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureDisplayEvent.java
@@ -23,14 +23,35 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Procedure;
-public class ProcedureDisplayEvent extends DataMapDisplayEvent {
+public class ProcedureDisplayEvent extends DisplayEvent {
- protected final Procedure procedure;
- protected boolean tabReset;
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final Procedure procedure;
+ private final boolean tabReset;
- public ProcedureDisplayEvent(Object src, Procedure procedure, DataMap map, DataChannelDescriptor domain) {
- super(src, map, domain);
+ public ProcedureDisplayEvent(Object src, DataChannelDescriptor domain, DataMap dataMap, Procedure procedure) {
+ this(src, domain, dataMap, procedure, false);
+ }
+
+ public ProcedureDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ Procedure procedure,
+ boolean tabReset) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
this.procedure = procedure;
+ this.tabReset = tabReset;
+ }
+
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
}
public Procedure getProcedure() {
@@ -40,8 +61,4 @@ public class ProcedureDisplayEvent extends DataMapDisplayEvent {
public boolean isTabReset() {
return tabReset;
}
-
- public void setTabReset(boolean b) {
- tabReset = b;
- }
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java
index 5a2179109..1028ceca5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ProcedureParameterDisplayEvent.java
@@ -25,30 +25,43 @@ import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
-public class ProcedureParameterDisplayEvent extends ProcedureDisplayEvent {
-
- protected final ProcedureParameter[] procedureParameters;
-
- public ProcedureParameterDisplayEvent(
- Object src,
- ProcedureParameter procedureParameter,
- Procedure procedure,
- DataMap map,
- DataChannelDescriptor domain) {
-
- super(src, procedure, map, domain);
- this.procedureParameters = new ProcedureParameter[] { procedureParameter };
+public class ProcedureParameterDisplayEvent extends DisplayEvent {
+
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final Procedure procedure;
+ private final ProcedureParameter[] procedureParameters;
+
+ public ProcedureParameterDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ Procedure procedure,
+ ProcedureParameter procedureParameter) {
+ this(src, domain, dataMap, procedure, new ProcedureParameter[]{procedureParameter});
}
-
- public ProcedureParameterDisplayEvent(
- Object src,
- ProcedureParameter[] procedureParameters,
- Procedure procedure,
- DataMap map,
- DataChannelDescriptor domain) {
-
- super(src, procedure, map, domain);
- this.procedureParameters = procedureParameters;
+
+ public ProcedureParameterDisplayEvent(Object src,
+ DataChannelDescriptor domain,
+ DataMap dataMap,
+ Procedure procedure,
+ ProcedureParameter[] procedureParameters) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
+ this.procedure = procedure;
+ this.procedureParameters = procedureParameters;
+ }
+
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
+ public Procedure getProcedure() {
+ return procedure;
}
public ProcedureParameter[] getProcedureParameters() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayEvent.java
index 6512389b0..c512b3c1a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/QueryDisplayEvent.java
@@ -24,14 +24,27 @@ import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.QueryDescriptor;
-public class QueryDisplayEvent extends DataMapDisplayEvent {
- protected final QueryDescriptor query;
+public class QueryDisplayEvent extends DisplayEvent {
- public QueryDisplayEvent(Object src, QueryDescriptor query, DataMap map, DataChannelDescriptor domain) {
- super(src, map, domain);
+ private final DataChannelDescriptor domain;
+ private final DataMap dataMap;
+ private final QueryDescriptor query;
+
+ public QueryDisplayEvent(Object src, DataChannelDescriptor domain, DataMap dataMap, QueryDescriptor query) {
+ super(src);
+ this.domain = domain;
+ this.dataMap = dataMap;
this.query = query;
}
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
+ public DataMap getDataMap() {
+ return dataMap;
+ }
+
public QueryDescriptor getQuery() {
return query;
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/RelationshipDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/RelationshipDisplayEvent.java
deleted file mode 100644
index 48a53c3db..000000000
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/RelationshipDisplayEvent.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- ****************************************************************/
-
-package org.apache.cayenne.modeler.event.display;
-
-import org.apache.cayenne.configuration.DataChannelDescriptor;
-import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.map.Entity;
-import org.apache.cayenne.map.Relationship;
-
-public class RelationshipDisplayEvent extends EntityDisplayEvent {
-
- private final Relationship<?, ?, ?>[] relationships;
-
- public RelationshipDisplayEvent(
- Object src,
- Relationship<?, ?, ?> relationship,
- Entity<?, ?, ?> entity,
- DataMap map,
- DataChannelDescriptor domain) {
-
- super(src, entity, map, domain);
- this.relationships = new Relationship[]{relationship};
- }
-
- public RelationshipDisplayEvent(
- Object src,
- Relationship<?, ?, ?>[] relationships,
- Entity<?, ?, ?> entity,
- DataMap map,
- DataChannelDescriptor domain) {
-
- super(src, entity, map, domain);
- this.relationships = relationships;
- }
-
- public Relationship<?, ?, ?>[] getRelationships() {
- return relationships;
- }
-}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayEvent.java
index 7c9d12ada..cf04542e5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/display/ValidationConfigDisplayEvent.java
@@ -21,15 +21,21 @@ package org.apache.cayenne.modeler.event.display;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.project.validation.Inspection;
-public class ValidationConfigDisplayEvent extends DomainDisplayEvent {
+public class ValidationConfigDisplayEvent extends DisplayEvent {
+ private final DataChannelDescriptor domain;
private final Inspection inspection;
public ValidationConfigDisplayEvent(Object src, DataChannelDescriptor domain, Inspection inspection) {
- super(src, domain);
+ super(src);
+ this.domain = domain;
this.inspection = inspection;
}
+ public DataChannelDescriptor getDomain() {
+ return domain;
+ }
+
public Inspection getInspection() {
return inspection;
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java
index ad52bcd50..aec6525ab 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/pref/ProjectSelectionMemo.java
@@ -22,29 +22,33 @@ package org.apache.cayenne.modeler.pref;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.configuration.DataNodeDescriptor;
-import org.apache.cayenne.map.Attribute;
import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.EmbeddableAttribute;
-import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Procedure;
import org.apache.cayenne.map.ProcedureParameter;
import org.apache.cayenne.map.QueryDescriptor;
-import org.apache.cayenne.map.Relationship;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
import org.apache.cayenne.modeler.event.display.DataNodeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbRelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
import org.apache.cayenne.modeler.event.display.EmbeddableAttributeDisplayEvent;
import org.apache.cayenne.modeler.event.display.EmbeddableDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.MultipleObjectsDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjRelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.display.ProcedureDisplayEvent;
import org.apache.cayenne.modeler.event.display.ProcedureParameterDisplayEvent;
import org.apache.cayenne.modeler.event.display.QueryDisplayEvent;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.util.CayenneMapEntry;
@@ -71,7 +75,7 @@ final class ProjectSelectionMemo {
private ProjectSelectionMemo() {
}
- static void save(ProjectController controller, ProjectStatePreferences prefs) {
+ public static void save(ProjectController controller, ProjectStatePreferences prefs) {
Kind kind = leafKind(controller);
if (kind == null) {
return;
@@ -90,23 +94,25 @@ final class ProjectSelectionMemo {
saveDataMapPath(controller, prefs);
break;
case objEntity:
+ saveObjEntityPath(controller, prefs);
+ break;
case dbEntity:
- saveEntityPath(controller, prefs);
+ saveDbEntityPath(controller, prefs);
break;
case objAttributes:
- saveEntityPath(controller, prefs);
+ saveObjEntityPath(controller, prefs);
prefs.setObjAttrs(joinNames(controller.getSelectedObjAttributes()));
break;
case dbAttributes:
- saveEntityPath(controller, prefs);
+ saveDbEntityPath(controller, prefs);
prefs.setDbAttrs(joinNames(controller.getSelectedDbAttributes()));
break;
case objRelationships:
- saveEntityPath(controller, prefs);
+ saveObjEntityPath(controller, prefs);
prefs.setObjRels(joinNames(controller.getSelectedObjRelationships()));
break;
case dbRelationships:
- saveEntityPath(controller, prefs);
+ saveDbEntityPath(controller, prefs);
prefs.setDbRels(joinNames(controller.getSelectedDbRelationships()));
break;
case embeddable:
@@ -132,7 +138,7 @@ final class ProjectSelectionMemo {
}
}
- static void restore(ProjectController controller, ProjectStatePreferences prefs) {
+ public static void restore(ProjectController controller, ProjectStatePreferences prefs) {
Kind kind = parseKind(prefs.getEvent());
if (kind == null) {
return;
@@ -154,16 +160,22 @@ final class ProjectSelectionMemo {
restoreDataMap(controller, domain, prefs);
break;
case objEntity:
+ restoreObjEntity(controller, domain, prefs);
+ break;
case dbEntity:
- restoreEntity(controller, domain, prefs);
+ restoreDbEntity(controller, domain, prefs);
break;
case objAttributes:
+ restoreObjAttributes(controller, domain, prefs);
+ break;
case dbAttributes:
- restoreAttributes(controller, domain, prefs);
+ restoreDbAttributes(controller, domain, prefs);
break;
case objRelationships:
+ restoreObjRelationships(controller, domain, prefs);
+ break;
case dbRelationships:
- restoreRelationships(controller, domain, prefs);
+ restoreDbRelationships(controller, domain, prefs);
break;
case embeddable:
restoreEmbeddable(controller, domain, prefs);
@@ -271,21 +283,16 @@ final class ProjectSelectionMemo {
}
}
- private static void saveEntityPath(ProjectController controller, ProjectStatePreferences prefs) {
- prefs.setDomain(controller.getSelectedDataDomain().getName());
- DataNodeDescriptor node = controller.getSelectedDataNode();
- prefs.setNode(node != null ? node.getName() : "");
- prefs.setDataMap(controller.getSelectedDataMap().getName());
+ private static void saveObjEntityPath(ProjectController controller, ProjectStatePreferences prefs) {
+ saveDataMapPath(controller, prefs);
+ prefs.setObjEntity(controller.getSelectedObjEntity().getName());
+ prefs.setDbEntity(null);
+ }
- ObjEntity objEntity = controller.getSelectedObjEntity();
- DbEntity dbEntity = controller.getSelectedDbEntity();
- if (objEntity != null) {
- prefs.setObjEntity(objEntity.getName());
- prefs.setDbEntity(null);
- } else if (dbEntity != null) {
- prefs.setDbEntity(dbEntity.getName());
- prefs.setObjEntity(null);
- }
+ private static void saveDbEntityPath(ProjectController controller, ProjectStatePreferences prefs) {
+ saveDataMapPath(controller, prefs);
+ prefs.setDbEntity(controller.getSelectedDbEntity().getName());
+ prefs.setObjEntity(null);
}
private static void saveEmbeddablePath(ProjectController controller, ProjectStatePreferences prefs) {
@@ -343,76 +350,103 @@ final class ProjectSelectionMemo {
return;
}
DataNodeDescriptor node = domain.getNodeDescriptor(prefs.getNode());
- controller.displayDataMap(new DataMapDisplayEvent(ProjectSelectionMemo.class, dataMap, domain, node));
+ controller.displayDataMap(new DataMapDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, node));
}
- private static void restoreEntity(ProjectController controller, DataChannelDescriptor domain,
- ProjectStatePreferences prefs) {
+ private static void restoreObjEntity(ProjectController controller, DataChannelDescriptor domain,
+ ProjectStatePreferences prefs) {
DataMap dataMap = domain.getDataMap(prefs.getDataMap());
if (dataMap == null) {
return;
}
- Entity<?, ?, ?> entity = lookupEntity(dataMap, prefs);
+ ObjEntity entity = dataMap.getObjEntity(prefs.getObjEntity());
if (entity == null) {
return;
}
- DataNodeDescriptor node = domain.getNodeDescriptor(prefs.getNode());
- EntityDisplayEvent event = new EntityDisplayEvent(ProjectSelectionMemo.class, entity, dataMap, node, domain);
- if (entity instanceof ObjEntity) {
- controller.displayObjEntity(event);
- } else if (entity instanceof DbEntity) {
- controller.displayDbEntity(event);
- }
+ controller.displayObjEntity(new ObjEntityDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity));
}
- private static void restoreAttributes(ProjectController controller, DataChannelDescriptor domain,
- ProjectStatePreferences prefs) {
+ private static void restoreDbEntity(ProjectController controller, DataChannelDescriptor domain,
+ ProjectStatePreferences prefs) {
DataMap dataMap = domain.getDataMap(prefs.getDataMap());
if (dataMap == null) {
return;
}
- Entity<?, ?, ?> entity = lookupEntity(dataMap, prefs);
+ DbEntity entity = dataMap.getDbEntity(prefs.getDbEntity());
if (entity == null) {
return;
}
- DataNodeDescriptor node = domain.getNodeDescriptor(prefs.getNode());
-
- EntityDisplayEvent entityEvent = new EntityDisplayEvent(ProjectSelectionMemo.class, entity, dataMap, node, domain);
- Attribute<?, ?, ?>[] attrs = lookupEntityAttributes(entity, prefs);
- AttributeDisplayEvent attrEvent = new AttributeDisplayEvent(ProjectSelectionMemo.class, attrs, entity, dataMap, domain);
+ controller.displayDbEntity(new DbEntityDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity));
+ }
- if (entity instanceof ObjEntity) {
- controller.displayObjEntity(entityEvent);
- controller.displayObjAttribute(attrEvent);
- } else if (entity instanceof DbEntity) {
- controller.displayDbEntity(entityEvent);
- controller.displayDbAttribute(attrEvent);
+ private static void restoreObjAttributes(ProjectController controller, DataChannelDescriptor domain,
+ ProjectStatePreferences prefs) {
+ DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+ if (dataMap == null) {
+ return;
+ }
+ ObjEntity entity = dataMap.getObjEntity(prefs.getObjEntity());
+ if (entity == null) {
+ return;
}
+ ObjAttribute[] attrs = lookupObjAttributes(entity, prefs);
+ controller.displayObjEntity(new ObjEntityDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity));
+ controller.displayObjAttribute(new ObjAttributeDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity, attrs));
}
- private static void restoreRelationships(ProjectController controller, DataChannelDescriptor domain,
- ProjectStatePreferences prefs) {
+ private static void restoreDbAttributes(ProjectController controller, DataChannelDescriptor domain,
+ ProjectStatePreferences prefs) {
DataMap dataMap = domain.getDataMap(prefs.getDataMap());
if (dataMap == null) {
return;
}
- Entity<?, ?, ?> entity = lookupEntity(dataMap, prefs);
+ DbEntity entity = dataMap.getDbEntity(prefs.getDbEntity());
if (entity == null) {
return;
}
- DataNodeDescriptor node = domain.getNodeDescriptor(prefs.getNode());
+ DbAttribute[] attrs = lookupDbAttributes(entity, prefs);
+ controller.displayDbEntity(new DbEntityDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity));
+ controller.displayDbAttribute(new DbAttributeDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity, attrs));
+ }
- EntityDisplayEvent entityEvent = new EntityDisplayEvent(ProjectSelectionMemo.class, entity, dataMap, node, domain);
- Relationship<?, ?, ?>[] rels = lookupEntityRelationships(entity, prefs);
- RelationshipDisplayEvent relEvent = new RelationshipDisplayEvent(ProjectSelectionMemo.class, rels, entity, dataMap, domain);
+ private static void restoreObjRelationships(ProjectController controller, DataChannelDescriptor domain,
+ ProjectStatePreferences prefs) {
+ DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+ if (dataMap == null) {
+ return;
+ }
+ ObjEntity entity = dataMap.getObjEntity(prefs.getObjEntity());
+ if (entity == null) {
+ return;
+ }
+ ObjRelationship[] rels = lookupObjRelationships(entity, prefs);
+ controller.displayObjEntity(new ObjEntityDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity));
+ controller.displayObjRelationship(new ObjRelationshipDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity, rels));
+ }
- if (entity instanceof ObjEntity) {
- controller.displayObjEntity(entityEvent);
- controller.displayObjRelationship(relEvent);
- } else if (entity instanceof DbEntity) {
- controller.displayDbEntity(entityEvent);
- controller.displayDbRelationship(relEvent);
+ private static void restoreDbRelationships(ProjectController controller, DataChannelDescriptor domain,
+ ProjectStatePreferences prefs) {
+ DataMap dataMap = domain.getDataMap(prefs.getDataMap());
+ if (dataMap == null) {
+ return;
}
+ DbEntity entity = dataMap.getDbEntity(prefs.getDbEntity());
+ if (entity == null) {
+ return;
+ }
+ DbRelationship[] rels = lookupDbRelationships(entity, prefs);
+ controller.displayDbEntity(new DbEntityDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity));
+ controller.displayDbRelationship(new DbRelationshipDisplayEvent(
+ ProjectSelectionMemo.class, domain, dataMap, entity, rels));
}
private static void restoreEmbeddable(ProjectController controller, DataChannelDescriptor domain,
@@ -425,7 +459,7 @@ final class ProjectSelectionMemo {
if (embeddable == null) {
return;
}
- controller.displayEmbeddable(new EmbeddableDisplayEvent(ProjectSelectionMemo.class, embeddable, dataMap, domain));
+ controller.displayEmbeddable(new EmbeddableDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, embeddable));
}
private static void restoreEmbeddableAttributes(ProjectController controller, DataChannelDescriptor domain,
@@ -438,11 +472,11 @@ final class ProjectSelectionMemo {
if (embeddable == null) {
return;
}
- controller.displayEmbeddable(new EmbeddableDisplayEvent(ProjectSelectionMemo.class, embeddable, dataMap, domain));
+ controller.displayEmbeddable(new EmbeddableDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, embeddable));
EmbeddableAttribute[] attrs = lookupEmbeddableAttributes(embeddable, prefs);
controller.displayEmbeddableAttribute(new EmbeddableAttributeDisplayEvent(
- ProjectSelectionMemo.class, embeddable, attrs, dataMap, domain));
+ ProjectSelectionMemo.class, domain, dataMap, embeddable, attrs));
}
private static void restoreProcedure(ProjectController controller, DataChannelDescriptor domain,
@@ -455,7 +489,7 @@ final class ProjectSelectionMemo {
if (procedure == null) {
return;
}
- controller.displayProcedure(new ProcedureDisplayEvent(ProjectSelectionMemo.class, procedure, dataMap, domain));
+ controller.displayProcedure(new ProcedureDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, procedure));
}
private static void restoreProcedureParameters(ProjectController controller, DataChannelDescriptor domain,
@@ -468,11 +502,11 @@ final class ProjectSelectionMemo {
if (procedure == null) {
return;
}
- controller.displayProcedure(new ProcedureDisplayEvent(ProjectSelectionMemo.class, procedure, dataMap, domain));
+ controller.displayProcedure(new ProcedureDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, procedure));
ProcedureParameter[] params = lookupProcedureParameters(procedure, prefs);
controller.displayProcedureParameter(new ProcedureParameterDisplayEvent(
- ProjectSelectionMemo.class, params, procedure, dataMap, domain));
+ ProjectSelectionMemo.class, domain, dataMap, procedure, params));
}
private static void restoreQuery(ProjectController controller, DataChannelDescriptor domain,
@@ -485,7 +519,7 @@ final class ProjectSelectionMemo {
if (query == null) {
return;
}
- controller.displayQuery(new QueryDisplayEvent(ProjectSelectionMemo.class, query, dataMap, domain));
+ controller.displayQuery(new QueryDisplayEvent(ProjectSelectionMemo.class, domain, dataMap, query));
}
private static void restoreMultipleObjects(ProjectController controller, DataChannelDescriptor domain,
@@ -513,34 +547,48 @@ final class ProjectSelectionMemo {
// -------------------- name lookups --------------------
- private static Entity<?, ?, ?> lookupEntity(DataMap dataMap, ProjectStatePreferences prefs) {
- return !prefs.getObjEntity().isEmpty()
- ? dataMap.getObjEntity(prefs.getObjEntity())
- : dataMap.getDbEntity(prefs.getDbEntity());
+ private static ObjAttribute[] lookupObjAttributes(ObjEntity entity, ProjectStatePreferences prefs) {
+ List<ObjAttribute> result = new ArrayList<>();
+ for (String name : prefs.getObjAttrs().split(",")) {
+ ObjAttribute attr = entity.getAttribute(name);
+ if (attr != null) {
+ result.add(attr);
+ }
+ }
+ return result.toArray(new ObjAttribute[0]);
}
- private static Attribute<?, ?, ?>[] lookupEntityAttributes(Entity<?, ?, ?> entity, ProjectStatePreferences prefs) {
- String stored = (entity instanceof ObjEntity) ? prefs.getObjAttrs() : prefs.getDbAttrs();
- List<Attribute<?, ?, ?>> result = new ArrayList<>();
- for (String name : stored.split(",")) {
- Attribute<?, ?, ?> attr = entity.getAttribute(name);
+ private static DbAttribute[] lookupDbAttributes(DbEntity entity, ProjectStatePreferences prefs) {
+ List<DbAttribute> result = new ArrayList<>();
+ for (String name : prefs.getDbAttrs().split(",")) {
+ DbAttribute attr = entity.getAttribute(name);
if (attr != null) {
result.add(attr);
}
}
- return result.toArray(new Attribute[0]);
+ return result.toArray(new DbAttribute[0]);
}
- private static Relationship<?, ?, ?>[] lookupEntityRelationships(Entity<?, ?, ?> entity, ProjectStatePreferences prefs) {
- String stored = (entity instanceof ObjEntity) ? prefs.getObjRels() : prefs.getDbRels();
- List<Relationship<?, ?, ?>> result = new ArrayList<>();
- for (String name : stored.split(",")) {
- Relationship<?, ?, ?> rel = entity.getRelationship(name);
+ private static ObjRelationship[] lookupObjRelationships(ObjEntity entity, ProjectStatePreferences prefs) {
+ List<ObjRelationship> result = new ArrayList<>();
+ for (String name : prefs.getObjRels().split(",")) {
+ ObjRelationship rel = entity.getRelationship(name);
+ if (rel != null) {
+ result.add(rel);
+ }
+ }
+ return result.toArray(new ObjRelationship[0]);
+ }
+
+ private static DbRelationship[] lookupDbRelationships(DbEntity entity, ProjectStatePreferences prefs) {
+ List<DbRelationship> result = new ArrayList<>();
+ for (String name : prefs.getDbRels().split(",")) {
+ DbRelationship rel = entity.getRelationship(name);
if (rel != null) {
result.add(rel);
}
}
- return result.toArray(new Relationship[0]);
+ return result.toArray(new DbRelationship[0]);
}
private static EmbeddableAttribute[] lookupEmbeddableAttributes(Embeddable embeddable, ProjectStatePreferences prefs) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/BaseViewEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/BaseViewEntityAction.java
index 5ce949435..91dd41e81 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/BaseViewEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/BaseViewEntityAction.java
@@ -24,7 +24,8 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.ui.project.ProjectView;
import org.apache.cayenne.modeler.ui.project.tree.ProjectTreeModel;
@@ -60,15 +61,13 @@ public abstract class BaseViewEntityAction extends ModelerAbstractAction {
ProjectView view = application.getFrameController().getView().getProjectView();
view.getProjectTreeView().getSelectionModel().setSelectionPath(path);
- EntityDisplayEvent event = new EntityDisplayEvent(
- view.getProjectTreeView(),
- entity,
- entity.getDataMap(),
- (DataChannelDescriptor) getProjectController().getProject().getRootNode());
+ DataChannelDescriptor domain = (DataChannelDescriptor) getProjectController().getProject().getRootNode();
if (entity instanceof DbEntity) {
- getProjectController().displayDbEntity(event);
+ getProjectController().displayDbEntity(new DbEntityDisplayEvent(
+ view.getProjectTreeView(), domain, entity.getDataMap(), (DbEntity) entity));
} else if (entity instanceof ObjEntity) {
- getProjectController().displayObjEntity(event);
+ getProjectController().displayObjEntity(new ObjEntityDisplayEvent(
+ view.getProjectTreeView(), domain, entity.getDataMap(), (ObjEntity) entity));
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java
index bffc06b00..57d175d0e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateAttributeAction.java
@@ -38,8 +38,9 @@ import org.apache.cayenne.modeler.event.model.EmbeddableAttributeEvent;
import org.apache.cayenne.modeler.event.model.ModelEvent;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbAttributeDisplayEvent;
import org.apache.cayenne.modeler.event.display.EmbeddableAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjAttributeDisplayEvent;
import org.apache.cayenne.modeler.undo.CreateAttributeUndoableEdit;
import org.apache.cayenne.modeler.undo.CreateEmbAttributeUndoableEdit;
@@ -52,8 +53,9 @@ public class CreateAttributeAction extends ModelerAbstractAction {
controller.fireEmbeddableAttributeEvent(EmbeddableAttributeEvent.ofAdd(src, attr, embeddable));
- EmbeddableAttributeDisplayEvent e = new EmbeddableAttributeDisplayEvent(src, embeddable, attr,
- controller.getSelectedDataMap(), (DataChannelDescriptor) controller.getProject().getRootNode());
+ DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
+ EmbeddableAttributeDisplayEvent e = new EmbeddableAttributeDisplayEvent(
+ src, domain, controller.getSelectedDataMap(), embeddable, attr);
controller.displayEmbeddableAttribute(e);
}
@@ -68,7 +70,7 @@ public class CreateAttributeAction extends ModelerAbstractAction {
DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
- AttributeDisplayEvent ade = new AttributeDisplayEvent(src, attr, objEntity, map, domain);
+ ObjAttributeDisplayEvent ade = new ObjAttributeDisplayEvent(src, domain, map, objEntity, attr);
controller.displayObjAttribute(ade);
}
@@ -80,8 +82,8 @@ public class CreateAttributeAction extends ModelerAbstractAction {
DbAttribute attr) {
controller.fireDbAttributeEvent(DbAttributeEvent.ofAdd(src, attr, dbEntity));
- AttributeDisplayEvent ade = new AttributeDisplayEvent(src, attr, dbEntity, map,
- (DataChannelDescriptor) controller.getProject().getRootNode());
+ DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
+ DbAttributeDisplayEvent ade = new DbAttributeDisplayEvent(src, domain, map, dbEntity, attr);
controller.displayDbAttribute(ade);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java
index a822c3ecf..3950e0d61 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDataMapAction.java
@@ -53,8 +53,7 @@ public class CreateDataMapAction extends ModelerAbstractAction {
controller.fireDataMapEvent(DataMapEvent.ofAdd(src, map));
- DataMapDisplayEvent displayEvent = new DataMapDisplayEvent(src, map, domain, node);
- displayEvent.setMainTabFocus(true);
+ DataMapDisplayEvent displayEvent = new DataMapDisplayEvent(src, domain, map, node, true);
controller.displayDataMap(displayEvent);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java
index 8eb83c7b4..8fff35aa0 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateDbEntityAction.java
@@ -25,11 +25,10 @@ import org.apache.cayenne.dbsync.naming.NameBuilder;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
-import org.apache.cayenne.modeler.event.model.DbEntityEvent;
-import org.apache.cayenne.modeler.event.model.ModelEvent;
import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.model.DbEntityEvent;
import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
import org.apache.cayenne.modeler.undo.CreateDbEntityUndoableEdit;
import java.awt.event.ActionEvent;
@@ -38,9 +37,13 @@ public class CreateDbEntityAction extends ModelerAbstractAction {
static void onDbEntityCreated(Object src, ProjectController controller, DbEntity entity) {
controller.fireDbEntityEvent(DbEntityEvent.ofAdd(src, entity));
- EntityDisplayEvent displayEvent = new EntityDisplayEvent(src, entity, controller.getSelectedDataMap(),
- controller.getSelectedDataNode(), (DataChannelDescriptor) controller.getProject().getRootNode());
- displayEvent.setMainTabFocus(true);
+ DbEntityDisplayEvent displayEvent = new DbEntityDisplayEvent(
+ src,
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
+ controller.getSelectedDataMap(),
+ entity,
+ true,
+ false);
controller.displayDbEntity(displayEvent);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java
index 97456c80f..0c19a84d6 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateEmbeddableAction.java
@@ -46,10 +46,10 @@ public class CreateEmbeddableAction extends ModelerAbstractAction {
dataMap);
EmbeddableDisplayEvent displayEvent = new EmbeddableDisplayEvent(
src,
- embeddable,
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
dataMap,
- (DataChannelDescriptor) controller.getProject().getRootNode());
- displayEvent.setMainTabFocus(true);
+ embeddable,
+ true);
controller.displayEmbeddable(displayEvent);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java
index 9e3c990ba..8cda0a0d5 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateObjEntityAction.java
@@ -28,11 +28,10 @@ import org.apache.cayenne.dbsync.naming.NoStemStemmer;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
-import org.apache.cayenne.modeler.event.model.ModelEvent;
import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
import org.apache.cayenne.modeler.undo.CreateObjEntityUndoableEdit;
import org.apache.cayenne.util.DeleteRuleUpdater;
@@ -46,13 +45,13 @@ public class CreateObjEntityAction extends ModelerAbstractAction {
DataMap dataMap,
ObjEntity entity) {
controller.fireObjEntityEvent(ObjEntityEvent.ofAdd(src, entity));
- EntityDisplayEvent displayEvent = new EntityDisplayEvent(
+ ObjEntityDisplayEvent displayEvent = new ObjEntityDisplayEvent(
src,
- entity,
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
dataMap,
- controller.getSelectedDataNode(),
- (DataChannelDescriptor) controller.getProject().getRootNode());
- displayEvent.setMainTabFocus(true);
+ entity,
+ true,
+ false);
controller.displayObjEntity(displayEvent);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java
index 0fc2f44ee..bbe9ba0b3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureAction.java
@@ -43,9 +43,12 @@ public class CreateProcedureAction extends ModelerAbstractAction {
*/
static void fireProcedureEvent(Object src, ProjectController controller, DataMap dataMap, Procedure procedure) {
controller.fireProcedureEvent(ProcedureEvent.ofAdd(src, procedure));
- ProcedureDisplayEvent displayEvent = new ProcedureDisplayEvent(src, procedure, controller.getSelectedDataMap(),
- (DataChannelDescriptor) controller.getProject().getRootNode());
- displayEvent.setTabReset(true);
+ ProcedureDisplayEvent displayEvent = new ProcedureDisplayEvent(
+ src,
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
+ controller.getSelectedDataMap(),
+ procedure,
+ true);
controller.displayProcedure(displayEvent);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java
index 529214a4f..abd2e2fce 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateProcedureParameterAction.java
@@ -49,8 +49,11 @@ public class CreateProcedureParameterAction extends ModelerAbstractAction {
ProcedureParameter parameter) {
controller.fireProcedureParameterEvent(ProcedureParameterEvent.ofAdd(src, parameter));
- controller.displayProcedureParameter(new ProcedureParameterDisplayEvent(src, parameter, procedure,
- controller.getSelectedDataMap(), (DataChannelDescriptor) controller.getProject().getRootNode()));
+ controller.displayProcedureParameter(new ProcedureParameterDisplayEvent(src,
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
+ controller.getSelectedDataMap(),
+ procedure,
+ parameter));
}
@Override
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateQueryAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateQueryAction.java
index 941e30e97..a9fda660f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateQueryAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateQueryAction.java
@@ -63,6 +63,6 @@ public class CreateQueryAction extends ModelerAbstractAction {
public static void fireQueryEvent(Object src, ProjectController mediator, DataChannelDescriptor domain,
DataMap dataMap, QueryDescriptor query) {
mediator.fireQueryEvent(QueryEvent.ofAdd(src, query, dataMap));
- mediator.displayQuery(new QueryDisplayEvent(src, query, dataMap, domain));
+ mediator.displayQuery(new QueryDisplayEvent(src, domain, dataMap, query));
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateRelationshipAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateRelationshipAction.java
index 399fe9433..16ef6dd3c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateRelationshipAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/CreateRelationshipAction.java
@@ -34,7 +34,8 @@ import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.ui.dbrelationship.DbRelationshipDialogController;
import org.apache.cayenne.modeler.ui.project.editor.objentity.relinfo.ObjRelationshipInfoController;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbRelationshipDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjRelationshipDisplayEvent;
import org.apache.cayenne.util.DeleteRuleUpdater;
import java.awt.event.ActionEvent;
@@ -49,8 +50,8 @@ public class CreateRelationshipAction extends ModelerAbstractAction {
mediator.fireObjRelationshipEvent(ObjRelationshipEvent.ofAdd(src, rel, objEntity));
- RelationshipDisplayEvent rde = new RelationshipDisplayEvent(src, rel, objEntity, mediator.getSelectedDataMap(),
- (DataChannelDescriptor) mediator.getProject().getRootNode());
+ DataChannelDescriptor domain = (DataChannelDescriptor) mediator.getProject().getRootNode();
+ ObjRelationshipDisplayEvent rde = new ObjRelationshipDisplayEvent(src, domain, mediator.getSelectedDataMap(), objEntity, rel);
mediator.displayObjRelationship(rde);
}
@@ -62,8 +63,8 @@ public class CreateRelationshipAction extends ModelerAbstractAction {
mediator.fireDbRelationshipEvent(DbRelationshipEvent.ofAdd(src, rel, dbEntity));
- RelationshipDisplayEvent rde = new RelationshipDisplayEvent(src, rel, dbEntity, mediator.getSelectedDataMap(),
- (DataChannelDescriptor) mediator.getProject().getRootNode());
+ DataChannelDescriptor domain = (DataChannelDescriptor) mediator.getProject().getRootNode();
+ DbRelationshipDisplayEvent rde = new DbRelationshipDisplayEvent(src, domain, mediator.getSelectedDataMap(), dbEntity, rel);
mediator.displayDbRelationship(rde);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FindAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FindAction.java
index c0a038aaf..a030f37ac 100755
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FindAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/FindAction.java
@@ -41,14 +41,17 @@ import org.apache.cayenne.map.Relationship;
import org.apache.cayenne.map.SQLTemplateDescriptor;
import org.apache.cayenne.map.SelectQueryDescriptor;
import org.apache.cayenne.modeler.Application;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbRelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.display.EmbeddableAttributeDisplayEvent;
import org.apache.cayenne.modeler.event.display.EmbeddableDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjRelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.display.ProcedureDisplayEvent;
import org.apache.cayenne.modeler.event.display.ProcedureParameterDisplayEvent;
import org.apache.cayenne.modeler.event.display.QueryDisplayEvent;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
import org.apache.cayenne.modeler.ui.find.FindDialogController;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.ui.project.ProjectView;
@@ -269,28 +272,30 @@ public class FindAction extends ModelerAbstractAction {
}
buildAndSelectTreePath(map, entity, projectView);
- if (searchResultEntry.getObject() instanceof Attribute) {
- AttributeDisplayEvent event = new AttributeDisplayEvent(projectView.getProjectTreeView(),
- (Attribute<?, ?, ?>) searchResultEntry.getObject(), entity, map, domain);
- event.setMainTabFocus(true);
- if (searchResultEntry.getObject() instanceof DbAttribute) {
- controller.displayDbAttribute(event);
- projectView.getEditorPanel().getDbDetailView().repaint();
- } else {
- controller.displayObjAttribute(event);
- projectView.getEditorPanel().getObjDetailView().repaint();
- }
- } else if (searchResultEntry.getObject() instanceof Relationship) {
- RelationshipDisplayEvent event = new RelationshipDisplayEvent(projectView.getProjectTreeView(),
- (Relationship<?, ?, ?>) searchResultEntry.getObject(), entity, map, domain);
- event.setMainTabFocus(true);
- if (searchResultEntry.getObject() instanceof DbRelationship) {
- controller.displayDbRelationship(event);
- projectView.getEditorPanel().getDbDetailView().repaint();
- } else {
- controller.displayObjRelationship(event);
- projectView.getEditorPanel().getObjDetailView().repaint();
- }
+ if (searchResultEntry.getObject() instanceof DbAttribute) {
+ DbAttributeDisplayEvent event = new DbAttributeDisplayEvent(
+ projectView.getProjectTreeView(), domain, map, (DbEntity) entity,
+ (DbAttribute) searchResultEntry.getObject());
+ controller.displayDbAttribute(event);
+ projectView.getEditorPanel().getDbDetailView().repaint();
+ } else if (searchResultEntry.getObject() instanceof ObjAttribute) {
+ ObjAttributeDisplayEvent event = new ObjAttributeDisplayEvent(
+ projectView.getProjectTreeView(), domain, map, (ObjEntity) entity,
+ (ObjAttribute) searchResultEntry.getObject());
+ controller.displayObjAttribute(event);
+ projectView.getEditorPanel().getObjDetailView().repaint();
+ } else if (searchResultEntry.getObject() instanceof DbRelationship) {
+ DbRelationshipDisplayEvent event = new DbRelationshipDisplayEvent(
+ projectView.getProjectTreeView(), domain, map, (DbEntity) entity,
+ (DbRelationship) searchResultEntry.getObject());
+ controller.displayDbRelationship(event);
+ projectView.getEditorPanel().getDbDetailView().repaint();
+ } else if (searchResultEntry.getObject() instanceof ObjRelationship) {
+ ObjRelationshipDisplayEvent event = new ObjRelationshipDisplayEvent(
+ projectView.getProjectTreeView(), domain, map, (ObjEntity) entity,
+ (ObjRelationship) searchResultEntry.getObject());
+ controller.displayObjRelationship(event);
+ projectView.getEditorPanel().getObjDetailView().repaint();
}
}
@@ -303,8 +308,8 @@ public class FindAction extends ModelerAbstractAction {
Embeddable embeddable = attribute.getEmbeddable();
DataMap map = embeddable.getDataMap();
buildAndSelectTreePath(map, embeddable, projectView);
- EmbeddableAttributeDisplayEvent event = new EmbeddableAttributeDisplayEvent(projectView.getProjectTreeView(), embeddable, attribute, map, domain);
- event.setMainTabFocus(true);
+ EmbeddableAttributeDisplayEvent event = new EmbeddableAttributeDisplayEvent(
+ projectView.getProjectTreeView(), domain, map, embeddable, attribute);
controller.displayEmbeddableAttribute(event);
projectView.getEditorPanel().getEmbeddableView().repaint();
}
@@ -313,27 +318,29 @@ public class FindAction extends ModelerAbstractAction {
ProjectController controller) {
DataMap map = embeddable.getDataMap();
buildAndSelectTreePath(map, embeddable, projectView);
- EmbeddableDisplayEvent event = new EmbeddableDisplayEvent(projectView.getProjectTreeView(), embeddable, map, domain);
- event.setMainTabFocus(true);
+ EmbeddableDisplayEvent event = new EmbeddableDisplayEvent(
+ projectView.getProjectTreeView(), domain, map, embeddable, true);
controller.displayEmbeddable(event);
}
private static void jumpToQueryResult(QueryDescriptor queryDescriptor, ProjectView projectView, DataChannelDescriptor domain, ProjectController controller) {
DataMap map = queryDescriptor.getDataMap();
buildAndSelectTreePath(map, queryDescriptor, projectView);
- QueryDisplayEvent event = new QueryDisplayEvent(projectView.getProjectTreeView(), queryDescriptor, map, domain);
+ QueryDisplayEvent event = new QueryDisplayEvent(projectView.getProjectTreeView(), domain, map, queryDescriptor);
controller.displayQuery(event);
}
private static void jumpToEntityResult(Entity<?, ?, ?> entity, ProjectView projectView, DataChannelDescriptor domain, ProjectController controller) {
DataMap map = entity.getDataMap();
buildAndSelectTreePath(map, entity, projectView);
- EntityDisplayEvent event = new EntityDisplayEvent(projectView.getProjectTreeView(), entity, map, domain);
- event.setMainTabFocus(true);
if (entity instanceof ObjEntity) {
+ ObjEntityDisplayEvent event = new ObjEntityDisplayEvent(
+ projectView.getProjectTreeView(), domain, map, (ObjEntity) entity, true, false);
controller.displayObjEntity(event);
} else if (entity instanceof DbEntity) {
+ DbEntityDisplayEvent event = new DbEntityDisplayEvent(
+ projectView.getProjectTreeView(), domain, map, (DbEntity) entity, true, false);
controller.displayDbEntity(event);
}
}
@@ -342,7 +349,7 @@ public class FindAction extends ModelerAbstractAction {
ProjectController controller) {
DataMap map = procedure.getDataMap();
buildAndSelectTreePath(map, procedure, projectView);
- ProcedureDisplayEvent event = new ProcedureDisplayEvent(projectView.getProjectTreeView(), procedure, map, domain);
+ ProcedureDisplayEvent event = new ProcedureDisplayEvent(projectView.getProjectTreeView(), domain, map, procedure);
controller.displayProcedure(event);
projectView.getEditorPanel().getProcedureView().repaint();
}
@@ -353,7 +360,7 @@ public class FindAction extends ModelerAbstractAction {
DataMap map = procedure.getDataMap();
buildAndSelectTreePath(map, procedure, projectView);
ProcedureParameterDisplayEvent event =
- new ProcedureParameterDisplayEvent(projectView.getProjectTreeView(), parameter, procedure, map, domain);
+ new ProcedureParameterDisplayEvent(projectView.getProjectTreeView(), domain, map, procedure, parameter);
controller.displayProcedureParameter(event);
projectView.getEditorPanel().getProcedureView().repaint();
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
index 915c254c4..ed4fc9a11 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ImportEOModelAction.java
@@ -298,10 +298,10 @@ public class ImportEOModelAction extends ModelerAbstractAction {
controller.displayDataMap(new DataMapDisplayEvent(
application.getFrameController().getView(),
- map,
(DataChannelDescriptor) controller
.getProject()
.getRootNode(),
+ map,
controller.getSelectedDataNode()));
} else {
// fix DataMap name, as there maybe a map with the same name already
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntitySyncAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntitySyncAction.java
index fc614573c..46e30bb10 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntitySyncAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/action/ObjEntitySyncAction.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.modeler.event.model.ModelEvent;
import org.apache.cayenne.modeler.Application;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.ui.entitysync.EntitySyncController;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import javax.swing.*;
import java.awt.*;
@@ -80,11 +80,11 @@ public class ObjEntitySyncAction extends ModelerAbstractAction {
if (merger.synchronizeWithDbEntity(entity)) {
mediator
.fireObjEntityEvent(ObjEntityEvent.ofChange(this, entity));
- mediator.displayObjEntity(new EntityDisplayEvent(
+ mediator.displayObjEntity(new ObjEntityDisplayEvent(
this,
- entity,
+ (DataChannelDescriptor) mediator.getProject().getRootNode(),
entity.getDataMap(),
- (DataChannelDescriptor) mediator.getProject().getRootNode()));
+ entity));
}
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
index dd0b8e40a..3cce12ecd 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/dbrelationship/DbRelationshipDialogController.java
@@ -27,7 +27,7 @@ import org.apache.cayenne.map.DbJoin;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbRelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.model.DbRelationshipEvent;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
@@ -384,8 +384,12 @@ public class DbRelationshipDialogController extends ChildController<ProjectContr
projectController.fireDbRelationshipEvent(DbRelationshipEvent.ofAdd(this, relationship, dbEntity));
- RelationshipDisplayEvent rde = new RelationshipDisplayEvent(this, relationship, dbEntity, projectController.getSelectedDataMap(),
- (DataChannelDescriptor) projectController.getProject().getRootNode());
+ DbRelationshipDisplayEvent rde = new DbRelationshipDisplayEvent(
+ this,
+ (DataChannelDescriptor) projectController.getProject().getRootNode(),
+ projectController.getSelectedDataMap(),
+ dbEntity,
+ relationship);
projectController.displayDbRelationship(rde);
application.getUndoManager().addEdit(
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
index 0aae776de..b5fd436d1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectController.java
@@ -785,15 +785,14 @@ public class ProjectController extends ChildController<ModelerController> {
navigationHistory.replayNextEvent(this);
}
- public void displayObjEntity(EntityDisplayEvent e) {
+ public void displayObjEntity(ObjEntityDisplayEvent e) {
boolean changed = e.getEntity() != state.objEntity;
if (changed) {
state = new ControllerState();
state.dataDomain = e.getDomain();
- state.dataNode = e.getDataNode();
state.dataMap = e.getDataMap();
- state.objEntity = (ObjEntity) e.getEntity();
+ state.objEntity = e.getEntity();
navigationHistory.recordEvent(e);
}
@@ -813,7 +812,6 @@ public class ProjectController extends ChildController<ModelerController> {
if (changed) {
state = new ControllerState();
state.dataDomain = e.getDomain();
- state.dataNode = e.getDataNode();
state.dataMap = e.getDataMap();
state.embeddable = e.getEmbeddable();
navigationHistory.recordEvent(e);
@@ -882,15 +880,14 @@ public class ProjectController extends ChildController<ModelerController> {
}
}
- public void displayDbEntity(EntityDisplayEvent e) {
+ public void displayDbEntity(DbEntityDisplayEvent e) {
boolean changed = e.getEntity() != state.dbEntity;
if (changed) {
state = new ControllerState();
state.dataDomain = e.getDomain();
- state.dataNode = e.getDataNode();
state.dataMap = e.getDataMap();
- state.dbEntity = (DbEntity) e.getEntity();
+ state.dbEntity = e.getEntity();
navigationHistory.recordEvent(e);
}
@@ -926,7 +923,7 @@ public class ProjectController extends ChildController<ModelerController> {
}
}
- public void displayDbAttribute(AttributeDisplayEvent e) {
+ public void displayDbAttribute(DbAttributeDisplayEvent e) {
boolean changed = !Arrays.equals(e.getAttributes(), state.dbAttributes);
if (changed) {
@@ -934,7 +931,7 @@ public class ProjectController extends ChildController<ModelerController> {
state = new ControllerState();
state.dataDomain = e.getDomain();
state.dataMap = e.getDataMap();
- state.dbEntity = (DbEntity) e.getEntity();
+ state.dbEntity = e.getEntity();
}
state.dbAttributes = new DbAttribute[e.getAttributes().length];
System.arraycopy(e.getAttributes(), 0, state.dbAttributes, 0, state.dbAttributes.length);
@@ -968,7 +965,7 @@ public class ProjectController extends ChildController<ModelerController> {
}
}
- public void displayObjAttribute(AttributeDisplayEvent e) {
+ public void displayObjAttribute(ObjAttributeDisplayEvent e) {
boolean changed = !Arrays.equals(e.getAttributes(), state.objAttributes);
if (changed) {
@@ -976,7 +973,7 @@ public class ProjectController extends ChildController<ModelerController> {
state = new ControllerState();
state.dataDomain = e.getDomain();
state.dataMap = e.getDataMap();
- state.objEntity = (ObjEntity) e.getEntity();
+ state.objEntity = e.getEntity();
}
state.objAttributes = new ObjAttribute[e.getAttributes().length];
System.arraycopy(e.getAttributes(), 0, state.objAttributes, 0, state.objAttributes.length);
@@ -1029,7 +1026,7 @@ public class ProjectController extends ChildController<ModelerController> {
}
}
- public void displayDbRelationship(RelationshipDisplayEvent e) {
+ public void displayDbRelationship(DbRelationshipDisplayEvent e) {
boolean changed = !Arrays.equals(e.getRelationships(), state.dbRelationships);
if (changed) {
@@ -1037,7 +1034,7 @@ public class ProjectController extends ChildController<ModelerController> {
state = new ControllerState();
state.dataDomain = e.getDomain();
state.dataMap = e.getDataMap();
- state.dbEntity = (DbEntity) e.getEntity();
+ state.dbEntity = e.getEntity();
}
state.dbRelationships = new DbRelationship[e.getRelationships().length];
System.arraycopy(e.getRelationships(), 0, state.dbRelationships, 0, state.dbRelationships.length);
@@ -1081,7 +1078,7 @@ public class ProjectController extends ChildController<ModelerController> {
}
}
- public void displayObjRelationship(RelationshipDisplayEvent e) {
+ public void displayObjRelationship(ObjRelationshipDisplayEvent e) {
boolean changed = !Arrays.equals(e.getRelationships(), state.objRelationships);
if (changed) {
@@ -1089,7 +1086,7 @@ public class ProjectController extends ChildController<ModelerController> {
state = new ControllerState();
state.dataDomain = e.getDomain();
state.dataMap = e.getDataMap();
- state.objEntity = (ObjEntity) e.getEntity();
+ state.objEntity = e.getEntity();
}
state.objRelationships = new ObjRelationship[e.getRelationships().length];
System.arraycopy(e.getRelationships(), 0, state.objRelationships, 0, state.objRelationships.length);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectNavigationHistory.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectNavigationHistory.java
index a131741e0..352707dd1 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectNavigationHistory.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/ProjectNavigationHistory.java
@@ -19,14 +19,13 @@
package org.apache.cayenne.modeler.ui.project;
-import org.apache.cayenne.map.DbEntity;
-import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
import org.apache.cayenne.modeler.event.display.DataNodeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.DisplayEvent;
import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
import org.apache.cayenne.modeler.event.display.EmbeddableDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ProcedureDisplayEvent;
import org.apache.cayenne.modeler.event.display.QueryDisplayEvent;
import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
@@ -97,13 +96,10 @@ public class ProjectNavigationHistory {
}
private void replay(ProjectController controller, DisplayEvent e) {
- if (e instanceof EntityDisplayEvent) {
- EntityDisplayEvent ede = (EntityDisplayEvent) e;
- if (ede.getEntity() instanceof ObjEntity) {
- controller.displayObjEntity(ede);
- } else if (ede.getEntity() instanceof DbEntity) {
- controller.displayDbEntity(ede);
- }
+ if (e instanceof ObjEntityDisplayEvent) {
+ controller.displayObjEntity((ObjEntityDisplayEvent) e);
+ } else if (e instanceof DbEntityDisplayEvent) {
+ controller.displayDbEntity((DbEntityDisplayEvent) e);
} else if (e instanceof EmbeddableDisplayEvent) {
controller.displayEmbeddable((EmbeddableDisplayEvent) e);
} else if (e instanceof ProcedureDisplayEvent) {
@@ -125,12 +121,12 @@ public class ProjectNavigationHistory {
Iterator<DisplayEvent> it = list.iterator();
while (it.hasNext()) {
DisplayEvent de = it.next();
- if (e instanceof DbEntityEvent && de instanceof EntityDisplayEvent) {
- if (((DbEntityEvent) e).getEntity() == ((EntityDisplayEvent) de).getEntity()) {
+ if (e instanceof DbEntityEvent && de instanceof DbEntityDisplayEvent) {
+ if (((DbEntityEvent) e).getEntity() == ((DbEntityDisplayEvent) de).getEntity()) {
it.remove();
}
- } else if (e instanceof ObjEntityEvent && de instanceof EntityDisplayEvent) {
- if (((ObjEntityEvent) e).getEntity() == ((EntityDisplayEvent) de).getEntity()) {
+ } else if (e instanceof ObjEntityEvent && de instanceof ObjEntityDisplayEvent) {
+ if (((ObjEntityEvent) e).getEntity() == ((ObjEntityDisplayEvent) de).getEntity()) {
it.remove();
}
} else if (e instanceof EmbeddableEvent && de instanceof EmbeddableDisplayEvent) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java
index 6b51030ed..57f8a084e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/DataDomainView.java
@@ -18,16 +18,18 @@
****************************************************************/
package org.apache.cayenne.modeler.ui.project.editor.datadomain;
-import org.apache.cayenne.modeler.ui.project.ProjectController;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.ui.action.GenerateCodeAction;
import org.apache.cayenne.modeler.ui.action.ShowValidationConfigAction;
+import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.ui.project.editor.datadomain.cgen.DataDomainCgenController;
import org.apache.cayenne.modeler.ui.project.editor.datadomain.dbimport.DataDomainDbImportController;
+import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.DataDomainGraphTab;
+import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.ShowGraphEntityAction;
import org.apache.cayenne.modeler.ui.project.editor.datadomain.main.DataDomainMainView;
import org.apache.cayenne.modeler.ui.project.editor.datadomain.validation.ValidationTabController;
-import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
-import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.DataDomainGraphTab;
import javax.swing.*;
import javax.swing.event.ChangeEvent;
@@ -69,6 +71,20 @@ public class DataDomainView extends JTabbedPane {
addChangeListener(this::stateChanged);
controller.addDomainDisplayListener(this::currentDomainChanged);
+ controller.addObjEntityDisplayListener(this::onEntitySelected);
+ controller.addDbEntityDisplayListener(this::onEntitySelected);
+ }
+
+ private void onEntitySelected(ObjEntityDisplayEvent e) {
+ if (e.getSource() instanceof ShowGraphEntityAction) {
+ setSelectedComponent(graphTab);
+ }
+ }
+
+ private void onEntitySelected(DbEntityDisplayEvent e) {
+ if (e.getSource() instanceof ShowGraphEntityAction) {
+ setSelectedComponent(graphTab);
+ }
}
private void stateChanged(ChangeEvent e) {
@@ -84,10 +100,6 @@ public class DataDomainView extends JTabbedPane {
}
private void currentDomainChanged(DomainDisplayEvent e) {
- if (e instanceof EntityDisplayEvent) {
- //need select an entity
- setSelectedComponent(graphTab);
- }
if (getSelectedComponent() == cgenView) {
fireStateChanged();
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenController.java
index ea1659266..ed94ea84d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/cgen/DataDomainCgenController.java
@@ -100,7 +100,7 @@ public class DataDomainCgenController extends DataDomainGeneratorsViewController
public void showConfig(DataMap dataMap) {
if (dataMap != null) {
- DataMapDisplayEvent event = new DataMapDisplayEvent(getView(), dataMap, dataMap.getDataChannelDescriptor());
+ DataMapDisplayEvent event = new DataMapDisplayEvent(getView(), dataMap.getDataChannelDescriptor(), dataMap);
getController().displayDataMap(event);
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportController.java
index fff0aa256..603f4cea8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/dbimport/DataDomainDbImportController.java
@@ -50,7 +50,7 @@ public class DataDomainDbImportController extends DataDomainGeneratorsViewContro
@Override
public void showConfig(DataMap dataMap) {
if (dataMap != null) {
- DataMapDisplayEvent event = new DataMapDisplayEvent(getView(), dataMap, dataMap.getDataChannelDescriptor());
+ DataMapDisplayEvent event = new DataMapDisplayEvent(getView(), dataMap.getDataChannelDescriptor(), dataMap);
getController().displayDataMap(event);
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/DataDomainGraphTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/DataDomainGraphTab.java
index 0f7af3a81..6a820803b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/DataDomainGraphTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/DataDomainGraphTab.java
@@ -21,9 +21,10 @@ package org.apache.cayenne.modeler.ui.project.editor.datadomain.graph;
import org.apache.cayenne.configuration.DataChannelDescriptor;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
import org.apache.cayenne.modeler.event.display.DomainDisplayListener;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.graph.GraphBuilder;
import org.apache.cayenne.modeler.graph.GraphRegistry;
import org.apache.cayenne.modeler.graph.GraphType;
@@ -31,6 +32,7 @@ import org.apache.cayenne.modeler.toolkit.combobox.CMComboBox;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.RebuildGraphAction;
import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.SaveAsImageAction;
+import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.ShowGraphEntityAction;
import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.ZoomInAction;
import org.apache.cayenne.modeler.ui.project.editor.datadomain.graph.action.ZoomOutAction;
import org.jgraph.JGraph;
@@ -58,6 +60,8 @@ public class DataDomainGraphTab extends JPanel implements DomainDisplayListener,
needRebuild = true;
controller.addDomainDisplayListener(this);
+ controller.addObjEntityDisplayListener(this::entityFocused);
+ controller.addDbEntityDisplayListener(this::entityFocused);
setLayout(new BorderLayout());
JToolBar toolbar = new JToolBar();
@@ -89,23 +93,7 @@ public class DataDomainGraphTab extends JPanel implements DomainDisplayListener,
}
public void domainSelected(DomainDisplayEvent e) {
- if (e instanceof EntityDisplayEvent) {
- // selecting an event
-
- // choose type of diagram
- Entity<?,?,?> entity = ((EntityDisplayEvent) e).getEntity();
- diagramCombo.setSelectedIndex(entity instanceof ObjEntity ? 1 : 0);
- refresh();
-
- GraphBuilder builder = getGraphRegistry().getGraphMap(domain).get(getSelectedType());
-
- Object cell = builder.getEntityCell(entity.getName());
-
- if (cell != null) {
- graph.setSelectionCell(cell);
- graph.scrollCellToVisible(cell);
- }
- } else if (domain != e.getDomain()) {
+ if (domain != e.getDomain()) {
needRebuild = true;
domain = e.getDomain();
@@ -115,6 +103,43 @@ public class DataDomainGraphTab extends JPanel implements DomainDisplayListener,
}
}
+ private void entityFocused(ObjEntityDisplayEvent e) {
+ if (e.getSource() instanceof ShowGraphEntityAction) {
+ focusEntity(e.getEntity(), e.getDomain());
+ }
+ }
+
+ private void entityFocused(DbEntityDisplayEvent e) {
+ if (e.getSource() instanceof ShowGraphEntityAction) {
+ focusEntity(e.getEntity(), e.getDomain());
+ }
+ }
+
+ private void focusEntity(Entity<?, ?, ?> entity, DataChannelDescriptor entityDomain) {
+ if (entity == null) {
+ return;
+ }
+
+ // align graph domain to selection if needed
+ if (domain != entityDomain) {
+ domain = entityDomain;
+ needRebuild = true;
+ }
+
+ // choose type of diagram
+ diagramCombo.setSelectedIndex(entity instanceof ObjEntity ? 1 : 0);
+ refresh();
+
+ GraphBuilder builder = getGraphRegistry().getGraphMap(domain).get(getSelectedType());
+
+ Object cell = builder.getEntityCell(entity.getName());
+
+ if (cell != null) {
+ graph.setSelectionCell(cell);
+ graph.scrollCellToVisible(cell);
+ }
+ }
+
/**
* Rebuilds graph from a domain, if it is not yet built Otherwise, takes it
* from cache
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/ShowGraphEntityAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/ShowGraphEntityAction.java
index f9cd5d891..20d9efab8 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/ShowGraphEntityAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/datadomain/graph/action/ShowGraphEntityAction.java
@@ -22,14 +22,16 @@ import java.awt.event.ActionEvent;
import org.apache.cayenne.configuration.ConfigurationNode;
import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.Application;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.ui.ModelerFrame;
+import org.apache.cayenne.modeler.ui.action.ModelerAbstractAction;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.ui.project.ProjectView;
-import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
-import org.apache.cayenne.modeler.ui.action.ModelerAbstractAction;
/**
* Action that shows entity on the graph
@@ -81,11 +83,12 @@ public class ShowGraphEntityAction extends ModelerAbstractAction {
.getSelectionPath()
.getParentPath()
.getParentPath());
- DomainDisplayEvent event = new EntityDisplayEvent(
- editor.getProjectTreeView(),
- entity,
- entity.getDataMap(),
- (DataChannelDescriptor) getProjectController().getProject().getRootNode());
- getProjectController().displayDomain(event);
+
+ DataChannelDescriptor domain = (DataChannelDescriptor) getProjectController().getProject().getRootNode();
+ if (entity instanceof ObjEntity) {
+ getProjectController().displayObjEntity(new ObjEntityDisplayEvent(this, domain, entity.getDataMap(), (ObjEntity) entity));
+ } else if (entity instanceof DbEntity) {
+ getProjectController().displayDbEntity(new DbEntityDisplayEvent(this, domain, entity.getDataMap(), (DbEntity) entity));
+ }
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java
index c69039197..c3e0da89f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/DbEntityView.java
@@ -19,19 +19,15 @@
package org.apache.cayenne.modeler.ui.project.editor.dbentity;
-import org.apache.cayenne.map.Attribute;
import org.apache.cayenne.map.DbAttribute;
-import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
-import org.apache.cayenne.map.Entity;
-import org.apache.cayenne.map.Relationship;
-import org.apache.cayenne.modeler.ui.project.ProjectController;
+import org.apache.cayenne.modeler.event.display.DbAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbRelationshipDisplayEvent;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.ui.action.RemoveAttributeAction;
import org.apache.cayenne.modeler.ui.action.RemoveRelationshipAction;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
+import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.ui.project.editor.dbentity.main.DbEntityMainView;
import org.apache.cayenne.modeler.ui.project.editor.dbentity.properties.DbAttributePanel;
import org.apache.cayenne.modeler.ui.project.editor.dbentity.properties.DbEntityPropertiesView;
@@ -78,9 +74,8 @@ public class DbEntityView extends JTabbedPane {
lastTabIndex = getSelectedIndex();
}
- private void currentDbEntityChanged(EntityDisplayEvent e) {
- Entity<?, ?, ?> entity = e.getEntity();
- if (!(entity instanceof DbEntity)) {
+ private void currentDbEntityChanged(DbEntityDisplayEvent e) {
+ if (e.getEntity() == null) {
return;
}
@@ -92,47 +87,43 @@ public class DbEntityView extends JTabbedPane {
}
resetRemoveButtons();
- setVisible(e.getEntity() != null);
+ setVisible(true);
setSelectedIndex(lastTabIndex);
}
- private void currentDbRelationshipChanged(RelationshipDisplayEvent e) {
+ private void currentDbRelationshipChanged(DbRelationshipDisplayEvent e) {
if (e.getEntity() == null) {
return;
}
// update relationship selection
- Relationship[] rels = e.getRelationships();
- DbRelationship[] dbRels = new DbRelationship[rels.length];
-
- System.arraycopy(rels, 0, dbRels, 0, rels.length);
+ DbRelationshipPanel relationshipPanel = (DbRelationshipPanel) attributeRelationshipTab.getSplitPane().getComponent(1);
+ DbRelationship[] dbRels = e.getRelationships();
// reset tab to relationship
- if (getSelectedComponent() != attributeRelationshipTab.getSplitPane().getComponent(1) && dbRels.length > 0) {
+ if (getSelectedComponent() != relationshipPanel && dbRels.length > 0) {
setSelectedComponent(attributeRelationshipTab);
- attributeRelationshipTab.getSplitPane().getComponent(1).setVisible(true);
+ relationshipPanel.setVisible(true);
}
- ((DbRelationshipPanel) attributeRelationshipTab.getSplitPane().getComponent(1)).selectRelationships(dbRels);
+ relationshipPanel.selectRelationships(dbRels);
attributeRelationshipTab.updateActions(dbRels);
}
- private void currentDbAttributeChanged(AttributeDisplayEvent e) {
+ private void currentDbAttributeChanged(DbAttributeDisplayEvent e) {
if (e.getEntity() == null)
return;
// update attribute selection
- Attribute<?, ?, ?>[] attrs = e.getAttributes();
- DbAttribute[] dbAttrs = new DbAttribute[attrs.length];
-
- System.arraycopy(attrs, 0, dbAttrs, 0, attrs.length);
+ DbAttributePanel attributePanel = (DbAttributePanel) attributeRelationshipTab.getSplitPane().getComponent(0);
+ DbAttribute[] dbAttrs = e.getAttributes();
- if (getSelectedComponent() != attributeRelationshipTab.getSplitPane().getComponent(0) && dbAttrs.length > 0) {
+ if (getSelectedComponent() != attributePanel && dbAttrs.length > 0) {
setSelectedComponent(attributeRelationshipTab);
- attributeRelationshipTab.getSplitPane().getComponent(0).setVisible(true);
+ attributePanel.setVisible(true);
}
- ((DbAttributePanel) attributeRelationshipTab.getSplitPane().getComponent(0)).selectAttributes(dbAttrs);
+ attributePanel.selectAttributes(dbAttrs);
attributeRelationshipTab.updateActions(dbAttrs);
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java
index 8765e24d8..f4b951080 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/main/DbEntityMainView.java
@@ -31,8 +31,8 @@ import org.apache.cayenne.modeler.ui.action.CreateObjEntityFromDbAction;
import org.apache.cayenne.modeler.ui.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.ui.action.DbEntityCounterpartAction;
import org.apache.cayenne.modeler.ui.action.DbEntitySyncAction;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
import org.apache.cayenne.modeler.toolkit.text.CMUndoableTextField;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.ui.project.editor.ExpressionConvertor;
@@ -162,13 +162,15 @@ public class DbEntityMainView extends JPanel implements ExistingSelectionProcess
}
public void processExistingSelection(EventObject e) {
- EntityDisplayEvent ede = new EntityDisplayEvent(this, controller.getSelectedDbEntity(),
- controller.getSelectedDataMap(), (DataChannelDescriptor) controller.getProject().getRootNode());
+ DbEntityDisplayEvent ede = new DbEntityDisplayEvent(this,
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
+ controller.getSelectedDataMap(),
+ controller.getSelectedDbEntity());
controller.displayDbEntity(ede);
}
- public void dbEntitySelected(EntityDisplayEvent e) {
- DbEntity entity = (DbEntity) e.getEntity();
+ public void dbEntitySelected(DbEntityDisplayEvent e) {
+ DbEntity entity = e.getEntity();
if (entity == null) {
return;
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
index 4077a0acd..bbf6cd96d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbAttributePanel.java
@@ -29,9 +29,9 @@ import org.apache.cayenne.modeler.ui.action.CopyAttributeRelationshipAction;
import org.apache.cayenne.modeler.ui.action.CutAttributeRelationshipAction;
import org.apache.cayenne.modeler.ui.action.PasteAction;
import org.apache.cayenne.modeler.ui.action.RemoveAttributeRelationshipAction;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.TablePopupHandler;
import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
import org.apache.cayenne.modeler.toolkit.table.BoardTableCellRenderer;
@@ -149,9 +149,9 @@ public class DbAttributePanel extends JPanel implements DbEntityDisplayListener,
}
@Override
- public void dbEntitySelected(EntityDisplayEvent e) {
+ public void dbEntitySelected(DbEntityDisplayEvent e) {
- DbEntity entity = (DbEntity) e.getEntity();
+ DbEntity entity = e.getEntity();
if (entity != null) {
rebuildTable(entity);
}
@@ -232,12 +232,12 @@ public class DbAttributePanel extends JPanel implements DbEntityDisplayListener,
}
}
- controller.displayDbAttribute(new AttributeDisplayEvent(
+ controller.displayDbAttribute(new DbAttributeDisplayEvent(
this,
- attrs,
- controller.getSelectedDbEntity(),
+ controller.getSelectedDataDomain(),
controller.getSelectedDataMap(),
- controller.getSelectedDataDomain()));
+ controller.getSelectedDbEntity(),
+ attrs));
parentPanel.updateActions(attrs);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
index 8eb8971b4..0393c380c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbEntityPropertiesView.java
@@ -20,8 +20,8 @@ package org.apache.cayenne.modeler.ui.project.editor.dbentity.properties;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
import org.apache.cayenne.modeler.event.model.DbEntityEvent;
import org.apache.cayenne.modeler.event.model.DbEntityListener;
import org.apache.cayenne.modeler.toolkit.splitpane.CMSplitPanePrefs;
@@ -143,8 +143,8 @@ public class DbEntityPropertiesView extends JPanel implements DbEntityDisplayLis
relationshipPanel.dbEntityRemoved(e);
}
- public void dbEntitySelected(EntityDisplayEvent e) {
- DbEntity entity = (DbEntity) e.getEntity();
+ public void dbEntitySelected(DbEntityDisplayEvent e) {
+ DbEntity entity = e.getEntity();
if (entity.getDataMap().getMappedEntities(entity).isEmpty()) {
toolBar.getComponentAtIndex(4).setEnabled(false);
toolBar.getComponentAtIndex(5).setEnabled(false);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
index fc8fb722a..61223e09a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/dbentity/properties/DbRelationshipPanel.java
@@ -33,9 +33,9 @@ import org.apache.cayenne.modeler.ui.action.CutAttributeRelationshipAction;
import org.apache.cayenne.modeler.ui.action.PasteAction;
import org.apache.cayenne.modeler.ui.action.RemoveAttributeRelationshipAction;
import org.apache.cayenne.modeler.ui.dbrelationship.DbRelationshipDialogController;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbRelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.display.TablePopupHandler;
import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
import org.apache.cayenne.modeler.toolkit.table.BoardTableCellRenderer;
@@ -150,8 +150,8 @@ public class DbRelationshipPanel extends JPanel implements DbEntityDisplayListen
/**
* Loads obj relationships into table.
*/
- public void dbEntitySelected(EntityDisplayEvent e) {
- DbEntity entity = (DbEntity) e.getEntity();
+ public void dbEntitySelected(DbEntityDisplayEvent e) {
+ DbEntity entity = e.getEntity();
if (entity != null) {
// TODO: this line seems to slow down the Modeler significantly sometimes
// (esp. noticable if selected entity has no relationships!),
@@ -309,12 +309,12 @@ public class DbRelationshipPanel extends JPanel implements DbEntityDisplayListen
editMenu.setEnabled(editEnabled);
}
- controller.displayDbRelationship(new RelationshipDisplayEvent(
+ controller.displayDbRelationship(new DbRelationshipDisplayEvent(
this,
- rels,
- controller.getSelectedDbEntity(),
+ controller.getSelectedDataDomain(),
controller.getSelectedDataMap(),
- controller.getSelectedDataDomain()));
+ controller.getSelectedDbEntity(),
+ rels));
parentPanel.updateActions(rels);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
index 1e3a13ffb..ffdd9852b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/embeddable/attributes/EmbeddableAttributesView.java
@@ -144,10 +144,10 @@ public class EmbeddableAttributesView extends JPanel implements
EmbeddableAttributeDisplayEvent ev = new EmbeddableAttributeDisplayEvent(
this,
- controller.getSelectedEmbeddable(),
- attrs,
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
controller.getSelectedDataMap(),
- (DataChannelDescriptor) controller.getProject().getRootNode());
+ controller.getSelectedEmbeddable(),
+ attrs);
controller.displayEmbeddableAttribute(ev);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java
index 08198fe6c..4711db09e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/ObjEntityView.java
@@ -19,21 +19,17 @@
package org.apache.cayenne.modeler.ui.project.editor.objentity;
-import org.apache.cayenne.modeler.ui.project.editor.query.ExistingSelectionProcessor;
-import org.apache.cayenne.map.Attribute;
-import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjAttribute;
-import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.map.ObjRelationship;
-import org.apache.cayenne.map.Relationship;
-import org.apache.cayenne.modeler.ui.project.ProjectController;
+import org.apache.cayenne.modeler.event.display.ObjAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjRelationshipDisplayEvent;
import org.apache.cayenne.modeler.service.action.GlobalActions;
import org.apache.cayenne.modeler.ui.action.RemoveAttributeAction;
import org.apache.cayenne.modeler.ui.action.RemoveCallbackMethodAction;
import org.apache.cayenne.modeler.ui.action.RemoveRelationshipAction;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
+import org.apache.cayenne.modeler.ui.project.ProjectController;
+import org.apache.cayenne.modeler.ui.project.editor.query.ExistingSelectionProcessor;
import org.apache.cayenne.modeler.ui.project.editor.objentity.callbacks.ObjEntityCallbacksView;
import org.apache.cayenne.modeler.ui.project.editor.objentity.main.ObjEntityMainView;
import org.apache.cayenne.modeler.ui.project.editor.objentity.properties.ObjAttributePanel;
@@ -100,9 +96,8 @@ public class ObjEntityView extends JTabbedPane {
globalActions.getAction(RemoveCallbackMethodAction.class).setEnabled(false);
}
- private void currentObjEntityChanged(EntityDisplayEvent e) {
- Entity<?, ?, ?> entity = e.getEntity();
- if (!(entity instanceof ObjEntity)) {
+ private void currentObjEntityChanged(ObjEntityDisplayEvent e) {
+ if (e.getEntity() == null) {
return;
}
@@ -114,49 +109,45 @@ public class ObjEntityView extends JTabbedPane {
}
resetRemoveButtons();
- setVisible(e.getEntity() != null);
+ setVisible(true);
if (getRootPane() != null) {
setSelectedIndex(lastTabIndex);
}
}
- private void currentObjRelationshipChanged(RelationshipDisplayEvent e) {
+ private void currentObjRelationshipChanged(ObjRelationshipDisplayEvent e) {
if (e.getEntity() == null) {
return;
}
// update relationship selection
- Relationship<?, ?, ?>[] rels = e.getRelationships();
- ObjRelationship[] objRels = new ObjRelationship[rels.length];
-
- System.arraycopy(rels, 0, objRels, 0, rels.length);
+ ObjRelationshipPanel relationshipPanel = (ObjRelationshipPanel) attributeRelationshipTab.getSplitPane().getComponent(1);
+ ObjRelationship[] objRels = e.getRelationships();
- if (getSelectedComponent() != attributeRelationshipTab.getSplitPane().getComponent(1) && objRels.length > 0) {
+ if (getSelectedComponent() != relationshipPanel && objRels.length > 0) {
setSelectedComponent(attributeRelationshipTab);
- attributeRelationshipTab.getSplitPane().getComponent(1).setVisible(true);
+ relationshipPanel.setVisible(true);
}
- ((ObjRelationshipPanel) attributeRelationshipTab.getSplitPane().getComponent(1)).selectRelationships(objRels);
+ relationshipPanel.selectRelationships(objRels);
attributeRelationshipTab.updateActions(objRels);
}
- private void currentObjAttributeChanged(AttributeDisplayEvent e) {
+ private void currentObjAttributeChanged(ObjAttributeDisplayEvent e) {
if (e.getEntity() == null)
return;
// update attribute selection
- Attribute<?, ?, ?>[] attrs = e.getAttributes();
- ObjAttribute[] objAttrs = new ObjAttribute[attrs.length];
-
- System.arraycopy(attrs, 0, objAttrs, 0, attrs.length);
+ ObjAttributePanel attributePanel = (ObjAttributePanel) attributeRelationshipTab.getSplitPane().getComponent(0);
+ ObjAttribute[] objAttrs = e.getAttributes();
- if (getSelectedComponent() != attributeRelationshipTab.getSplitPane().getComponent(0) && objAttrs.length > 0) {
+ if (getSelectedComponent() != attributePanel && objAttrs.length > 0) {
setSelectedComponent(attributeRelationshipTab);
- attributeRelationshipTab.getSplitPane().getComponent(0).setVisible(true);
+ attributePanel.setVisible(true);
}
- ((ObjAttributePanel) attributeRelationshipTab.getSplitPane().getComponent(0)).selectAttributes(objAttrs);
+ attributePanel.selectAttributes(objAttrs);
attributeRelationshipTab.updateActions(objAttrs);
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogController.java
index 8dae9e7c1..ac34cd8ed 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/attrinfo/ObjAttributeInfoDialogController.java
@@ -27,8 +27,8 @@ import org.apache.cayenne.map.EmbeddableAttribute;
import org.apache.cayenne.map.EmbeddedAttribute;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.model.ObjAttributeEvent;
import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
import org.apache.cayenne.modeler.mvc.ChildController;
@@ -522,16 +522,16 @@ public class ObjAttributeInfoDialogController extends ChildController<ProjectCon
mediator.fireObjEntityEvent(ObjEntityEvent.ofChange(this, model.getEntity()));
- EntityDisplayEvent event = new EntityDisplayEvent(this, mediator.getSelectedObjEntity(),
- mediator.getSelectedDataMap(), (DataChannelDescriptor) mediator.getProject().getRootNode());
+ DataChannelDescriptor domain = (DataChannelDescriptor) mediator.getProject().getRootNode();
+ ObjEntityDisplayEvent event = new ObjEntityDisplayEvent(this, domain,
+ mediator.getSelectedDataMap(), mediator.getSelectedObjEntity());
mediator.displayObjEntity(event);
mediator.fireObjAttributeEvent(ObjAttributeEvent.ofChange(this, attributeSaved, model.getEntity()));
- AttributeDisplayEvent eventAttr = new AttributeDisplayEvent(this, attributeSaved,
- mediator.getSelectedObjEntity(), mediator.getSelectedDataMap(), (DataChannelDescriptor) mediator
- .getProject().getRootNode());
+ ObjAttributeDisplayEvent eventAttr = new ObjAttributeDisplayEvent(this, domain,
+ mediator.getSelectedDataMap(), mediator.getSelectedObjEntity(), attributeSaved);
mediator.displayObjAttribute(eventAttr);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java
index 170965b73..8555c5232 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/main/ObjEntityMainView.java
@@ -33,7 +33,8 @@ import org.apache.cayenne.modeler.ui.action.CreateAttributeAction;
import org.apache.cayenne.modeler.ui.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.ui.action.ObjEntityCounterpartAction;
import org.apache.cayenne.modeler.ui.action.ObjEntitySyncAction;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
import org.apache.cayenne.modeler.toolkit.Renderers;
import org.apache.cayenne.modeler.toolkit.checkbox.CMCheckBox;
@@ -216,14 +217,14 @@ public class ObjEntityMainView extends JPanel implements ObjEntityDisplayListene
dbEntityCombo.getModel().setSelectedItem(entity.getDbEntity());
superClassName.setText(entity.getSuperClassName());
- // fire both EntityEvent and EntityDisplayEvent;
+ // fire both ObjEntityEvent and ObjEntityDisplayEvent;
// the latter is to update attribute and relationship display
DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
DataMap map = controller.getSelectedDataMap();
controller.fireObjEntityEvent(ObjEntityEvent.ofChange(this, entity));
- controller.displayObjEntity(new EntityDisplayEvent(this, entity, map, domain));
+ controller.displayObjEntity(new ObjEntityDisplayEvent(this, domain, map, entity));
}
});
@@ -232,7 +233,7 @@ public class ObjEntityMainView extends JPanel implements ObjEntityDisplayListene
DbEntity entity = controller.getSelectedObjEntity().getDbEntity();
if (entity != null) {
DataChannelDescriptor dom = (DataChannelDescriptor) controller.getProject().getRootNode();
- controller.displayDbEntity(new EntityDisplayEvent(this, entity, entity.getDataMap(), dom));
+ controller.displayDbEntity(new DbEntityDisplayEvent(this, dom, entity.getDataMap(), entity));
}
});
@@ -405,16 +406,16 @@ public class ObjEntityMainView extends JPanel implements ObjEntityDisplayListene
public void processExistingSelection(EventObject e) {
- EntityDisplayEvent ede = new EntityDisplayEvent(
+ ObjEntityDisplayEvent ede = new ObjEntityDisplayEvent(
this,
- controller.getSelectedObjEntity(),
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
controller.getSelectedDataMap(),
- (DataChannelDescriptor) controller.getProject().getRootNode());
+ controller.getSelectedObjEntity());
controller.displayObjEntity(ede);
}
- public void objEntitySelected(EntityDisplayEvent e) {
- ObjEntity entity = (ObjEntity) e.getEntity();
+ public void objEntitySelected(ObjEntityDisplayEvent e) {
+ ObjEntity entity = e.getEntity();
if (entity == null) {
return;
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
index 9690c9159..449e20437 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributePanel.java
@@ -23,8 +23,8 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
import org.apache.cayenne.modeler.event.display.TablePopupHandler;
import org.apache.cayenne.modeler.event.model.ObjAttributeEvent;
@@ -273,12 +273,12 @@ public class ObjAttributePanel extends JPanel implements ObjEntityDisplayListene
}
}
- public void objEntitySelected(EntityDisplayEvent e) {
+ public void objEntitySelected(ObjEntityDisplayEvent e) {
if (e.getSource() == this) {
return;
}
- ObjEntity entity = (ObjEntity) e.getEntity();
+ ObjEntity entity = e.getEntity();
// Important: process event even if this is the same entity,
// since the inheritance structure might have changed
@@ -478,12 +478,12 @@ public class ObjAttributePanel extends JPanel implements ObjEntityDisplayListene
editMenu.setEnabled(editEnabled);
}
- controller.displayObjAttribute(new AttributeDisplayEvent(
+ controller.displayObjAttribute(new ObjAttributeDisplayEvent(
this,
- attrs,
- controller.getSelectedObjEntity(),
+ controller.getSelectedDataDomain(),
controller.getSelectedDataMap(),
- controller.getSelectedDataDomain()));
+ controller.getSelectedObjEntity(),
+ attrs));
parentPanel.updateActions(attrs);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java
index ead6609bb..cb1bfb84e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjAttributeTableModel.java
@@ -30,8 +30,8 @@ import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.EmbeddedAttribute;
import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.model.ObjAttributeEvent;
import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
import org.apache.cayenne.modeler.project.DbEntityOps;
@@ -268,23 +268,23 @@ public class ObjAttributeTableModel extends CMTableModel<ObjAttribute> {
controller.fireObjEntityEvent(ObjEntityEvent.ofChange(this, entity));
- controller.displayObjEntity(new EntityDisplayEvent(
+ controller.displayObjEntity(new ObjEntityDisplayEvent(
this,
- controller.getSelectedObjEntity(),
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
controller.getSelectedDataMap(),
- (DataChannelDescriptor) controller.getProject().getRootNode()));
+ controller.getSelectedObjEntity()));
controller.fireObjAttributeEvent(ObjAttributeEvent.ofChange(
this,
attributeNew,
entity));
- controller.displayObjAttribute(new AttributeDisplayEvent(
+ controller.displayObjAttribute(new ObjAttributeDisplayEvent(
this,
- attributeNew,
- controller.getSelectedObjEntity(),
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
controller.getSelectedDataMap(),
- (DataChannelDescriptor) controller.getProject().getRootNode()));
+ controller.getSelectedObjEntity(),
+ attributeNew));
}
private void setColumnLocking(ObjAttribute attribute, Object value) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
index 0f998d61e..77293c93b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjEntityPropertiesView.java
@@ -18,7 +18,7 @@
****************************************************************/
package org.apache.cayenne.modeler.ui.project.editor.objentity.properties;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
import org.apache.cayenne.modeler.event.model.ObjEntityEvent;
import org.apache.cayenne.modeler.event.model.ObjEntityListener;
@@ -144,7 +144,7 @@ public class ObjEntityPropertiesView extends JPanel implements ObjEntityDisplayL
}
@Override
- public void objEntitySelected(EntityDisplayEvent e) {
+ public void objEntitySelected(ObjEntityDisplayEvent e) {
attributePanel.objEntitySelected(e);
relationshipPanel.objEntitySelected(e);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
index f5fa3ec2c..464abdb71 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/properties/ObjRelationshipPanel.java
@@ -36,9 +36,9 @@ import org.apache.cayenne.modeler.ui.action.ObjEntityToSuperEntityAction;
import org.apache.cayenne.modeler.ui.action.PasteAction;
import org.apache.cayenne.modeler.ui.action.RemoveAttributeRelationshipAction;
import org.apache.cayenne.modeler.ui.project.editor.objentity.relinfo.ObjRelationshipInfoController;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjRelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.display.TablePopupHandler;
import org.apache.cayenne.modeler.toolkit.table.CMTablePrefs;
import org.apache.cayenne.modeler.toolkit.table.CMTable;
@@ -163,12 +163,12 @@ public class ObjRelationshipPanel extends JPanel implements ObjEntityDisplayList
/**
* Loads obj relationships into table.
*/
- public void objEntitySelected(EntityDisplayEvent e) {
+ public void objEntitySelected(ObjEntityDisplayEvent e) {
if (e.getSource() == this) {
return;
}
- ObjEntity entity = (ObjEntity) e.getEntity();
+ ObjEntity entity = e.getEntity();
// Important: process event even if this is the same entity,
// since the inheritance structure might have changed
@@ -430,12 +430,12 @@ public class ObjRelationshipPanel extends JPanel implements ObjEntityDisplayList
editMenu.setEnabled(editEnabled);
}
- controller.displayObjRelationship(new RelationshipDisplayEvent(
+ controller.displayObjRelationship(new ObjRelationshipDisplayEvent(
this,
- rels,
- controller.getSelectedObjEntity(),
+ controller.getSelectedDataDomain(),
controller.getSelectedDataMap(),
- controller.getSelectedDataDomain()));
+ controller.getSelectedObjEntity(),
+ rels));
parentPanel.updateActions(rels);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java
index 04fe0d523..5bfd1c4b3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/objentity/relinfo/ObjRelationshipInfoController.java
@@ -30,7 +30,7 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.modeler.event.model.ObjRelationshipEvent;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.ui.dbrelationship.DbRelationshipDialogController;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjRelationshipDisplayEvent;
import org.apache.cayenne.modeler.mvc.ChildController;
import org.apache.cayenne.modeler.undo.CreateRelationshipUndoableEdit;
import org.apache.cayenne.modeler.undo.RelationshipUndoableEdit;
@@ -264,12 +264,12 @@ public class ObjRelationshipInfoController extends ChildController<ProjectContro
private void fireObjRelationshipEvent(Object src) {
parent.fireObjRelationshipEvent(ObjRelationshipEvent.ofAdd(src, relationship, relationship.getSourceEntity()));
- RelationshipDisplayEvent rde = new RelationshipDisplayEvent(
+ ObjRelationshipDisplayEvent rde = new ObjRelationshipDisplayEvent(
src,
- relationship,
+ (DataChannelDescriptor) parent.getProject().getRootNode(),
+ parent.getSelectedDataMap(),
relationship.getSourceEntity(),
- parent.getSelectedDataMap(), (DataChannelDescriptor)
- parent.getProject().getRootNode());
+ relationship);
parent.displayObjRelationship(rde);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
index 34e4195e9..461ba04ca 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureParameterTab.java
@@ -223,10 +223,10 @@ public class ProcedureParameterTab extends JPanel implements ProcedureParameterL
ProcedureParameterDisplayEvent ppde = new ProcedureParameterDisplayEvent(
this,
- parameters,
- controller.getSelectedProcedure(),
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
controller.getSelectedDataMap(),
- (DataChannelDescriptor) controller.getProject().getRootNode());
+ controller.getSelectedProcedure(),
+ parameters);
controller.displayProcedureParameter(ppde);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java
index 88811c515..2fca9aebf 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/editor/procedure/ProcedureTab.java
@@ -107,8 +107,10 @@ public class ProcedureTab extends JPanel implements ProcedureDisplayListener, Ex
}
public void processExistingSelection(EventObject e) {
- ProcedureDisplayEvent pde = new ProcedureDisplayEvent(this, eventController.getSelectedProcedure(),
- eventController.getSelectedDataMap(), (DataChannelDescriptor) eventController.getProject().getRootNode());
+ ProcedureDisplayEvent pde = new ProcedureDisplayEvent(this,
+ (DataChannelDescriptor) eventController.getProject().getRootNode(),
+ eventController.getSelectedDataMap(),
+ eventController.getSelectedProcedure());
eventController.displayProcedure(pde);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeController.java
index 2360d2f51..54da5fa34 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/querytype/QueryTypeController.java
@@ -102,8 +102,9 @@ public class QueryTypeController extends ChildController<ProjectController> {
public static void fireQueryEvent(Object src, ProjectController controller,
DataMap dataMap, QueryDescriptor query) {
controller.fireQueryEvent(QueryEvent.ofAdd(src, query, dataMap));
- controller.displayQuery(new QueryDisplayEvent(src, query,
- dataMap, (DataChannelDescriptor) controller.getProject().getRootNode()));
+ controller.displayQuery(new QueryDisplayEvent(src,
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
+ dataMap, query));
}
public String getSelectedQuery() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java
index 802aa041c..2b7b653ee 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/tree/ProjectTreeController.java
@@ -53,14 +53,15 @@ import org.apache.cayenne.modeler.event.display.DataMapDisplayEvent;
import org.apache.cayenne.modeler.event.display.DataMapDisplayListener;
import org.apache.cayenne.modeler.event.display.DataNodeDisplayEvent;
import org.apache.cayenne.modeler.event.display.DataNodeDisplayListener;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.DbEntityDisplayListener;
import org.apache.cayenne.modeler.event.display.DomainDisplayEvent;
import org.apache.cayenne.modeler.event.display.DomainDisplayListener;
import org.apache.cayenne.modeler.event.display.EmbeddableDisplayEvent;
import org.apache.cayenne.modeler.event.display.EmbeddableDisplayListener;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.MultipleObjectsDisplayEvent;
import org.apache.cayenne.modeler.event.display.MultipleObjectsDisplayListener;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.event.display.ObjEntityDisplayListener;
import org.apache.cayenne.modeler.event.display.ProcedureDisplayEvent;
import org.apache.cayenne.modeler.event.display.ProcedureDisplayListener;
@@ -252,12 +253,12 @@ public class ProjectTreeController extends ChildController<ProjectController>
}
@Override
- public void objEntitySelected(EntityDisplayEvent e) {
+ public void objEntitySelected(ObjEntityDisplayEvent e) {
navigateTo(e.getDomain(), e.getDataMap(), e.getEntity());
}
@Override
- public void dbEntitySelected(EntityDisplayEvent e) {
+ public void dbEntitySelected(DbEntityDisplayEvent e) {
navigateTo(e.getDomain(), e.getDataMap(), e.getEntity());
}
@@ -693,75 +694,64 @@ public class ProjectTreeController extends ChildController<ProjectController>
return;
}
+ DataChannelDescriptor domain = (DataChannelDescriptor) parent.getProject().getRootNode();
Object obj = data[data.length - 1];
if (obj instanceof DataChannelDescriptor) {
- parent.displayDomain(new DomainDisplayEvent(
- this,
- (DataChannelDescriptor) obj));
+ parent.displayDomain(new DomainDisplayEvent(this, (DataChannelDescriptor) obj));
} else if (obj instanceof DataMap) {
if (data.length == 2) {
parent.displayDataMap(new DataMapDisplayEvent(
this,
+ domain,
(DataMap) obj,
- (DataChannelDescriptor) parent.getProject().getRootNode(),
(DataNodeDescriptor) data[data.length - 2]));
} else if (data.length == 1) {
parent.displayDataMap(new DataMapDisplayEvent(
this,
- (DataMap) obj,
- (DataChannelDescriptor) parent.getProject().getRootNode()));
+ domain,
+ (DataMap) obj));
}
} else if (obj instanceof DataNodeDescriptor) {
if (data.length == 1) {
parent.displayDataNode(new DataNodeDisplayEvent(
this,
- (DataChannelDescriptor) parent.getProject().getRootNode(),
+ domain,
(DataNodeDescriptor) obj));
}
- } else if (obj instanceof Entity) {
-
- EntityDisplayEvent e = (data.length == 3)
-
- ? new EntityDisplayEvent(
+ } else if (obj instanceof ObjEntity) {
+ parent.displayObjEntity(new ObjEntityDisplayEvent(
this,
- (Entity) obj, (DataMap) data[data.length - 2],
- (DataNodeDescriptor) data[data.length - 3],
- (DataChannelDescriptor) parent.getProject().getRootNode())
-
- : new EntityDisplayEvent(
+ domain,
+ (DataMap) data[data.length - 2],
+ (ObjEntity) obj,
+ false,
+ true));
+ } else if (obj instanceof DbEntity) {
+ parent.displayDbEntity(new DbEntityDisplayEvent(
this,
- (Entity) obj, (DataMap) data[data.length - 2],
- (DataChannelDescriptor) parent.getProject().getRootNode());
-
-
- e.setUnselectAttributes(true);
-
- if (obj instanceof ObjEntity) {
- parent.displayObjEntity(e);
- } else if (obj instanceof DbEntity) {
- parent.displayDbEntity(e);
- }
+ domain,
+ (DataMap) data[data.length - 2],
+ (DbEntity) obj,
+ false,
+ true));
} else if (obj instanceof Embeddable) {
- EmbeddableDisplayEvent e = new EmbeddableDisplayEvent(
+ parent.displayEmbeddable(new EmbeddableDisplayEvent(
this,
- (Embeddable) obj,
+ domain,
(DataMap) data[data.length - 2],
- (DataChannelDescriptor) parent.getProject().getRootNode());
- parent.displayEmbeddable(e);
+ (Embeddable) obj));
} else if (obj instanceof Procedure) {
- ProcedureDisplayEvent e = new ProcedureDisplayEvent(
+ parent.displayProcedure(new ProcedureDisplayEvent(
this,
- (Procedure) obj,
+ domain,
(DataMap) data[data.length - 2],
- (DataChannelDescriptor) parent.getProject().getRootNode());
- parent.displayProcedure(e);
+ (Procedure) obj));
} else if (obj instanceof QueryDescriptor) {
- QueryDisplayEvent e = new QueryDisplayEvent(
+ parent.displayQuery(new QueryDisplayEvent(
this,
- (QueryDescriptor) obj,
+ domain,
(DataMap) data[data.length - 2],
- (DataChannelDescriptor) parent.getProject().getRootNode());
- parent.displayQuery(e);
+ (QueryDescriptor) obj));
}
view.scrollPathToVisible(path);
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/AttributeErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/AttributeErrorMsg.java
index e0dd9c5f3..8a612581a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/AttributeErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/AttributeErrorMsg.java
@@ -23,16 +23,21 @@ import javax.swing.JFrame;
import org.apache.cayenne.map.Attribute;
import org.apache.cayenne.map.DataMap;
+import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
+import org.apache.cayenne.map.ObjAttribute;
import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.modeler.event.display.DbAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.event.display.AttributeDisplayEvent;
import org.apache.cayenne.validation.ValidationFailure;
/**
* Attribute validation message.
- *
+ *
*/
public class AttributeErrorMsg extends ValidationDisplayHandler {
@@ -53,16 +58,14 @@ public class AttributeErrorMsg extends ValidationDisplayHandler {
}
public void displayField(ProjectController mediator, JFrame frame) {
- AttributeDisplayEvent event = new AttributeDisplayEvent(frame, attribute, entity, map, domain);
-
- // must first display entity, and then switch to relationship display ..
+ // must first display entity, and then switch to attribute display ..
// so fire twice
if (entity instanceof ObjEntity) {
- mediator.displayObjEntity(event);
- mediator.displayObjAttribute(event);
+ mediator.displayObjEntity(new ObjEntityDisplayEvent(frame, domain, map, (ObjEntity) entity));
+ mediator.displayObjAttribute(new ObjAttributeDisplayEvent(frame, domain, map, (ObjEntity) entity, (ObjAttribute) attribute));
} else if (entity instanceof DbEntity) {
- mediator.displayDbEntity(event);
- mediator.displayDbAttribute(event);
+ mediator.displayDbEntity(new DbEntityDisplayEvent(frame, domain, map, (DbEntity) entity));
+ mediator.displayDbAttribute(new DbAttributeDisplayEvent(frame, domain, map, (DbEntity) entity, (DbAttribute) attribute));
}
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DataMapErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DataMapErrorMsg.java
index 4d3e0c8e6..237440064 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DataMapErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/DataMapErrorMsg.java
@@ -42,7 +42,7 @@ public class DataMapErrorMsg extends ValidationDisplayHandler {
public void displayField(ProjectController mediator, JFrame frame) {
DataMapDisplayEvent event;
- event = new DataMapDisplayEvent(frame, map, domain);
+ event = new DataMapDisplayEvent(frame, domain, map);
mediator.displayDataMap(event);
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableAttributeErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableAttributeErrorMsg.java
index a0803c053..a2d07331c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableAttributeErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableAttributeErrorMsg.java
@@ -25,6 +25,7 @@ import org.apache.cayenne.map.Embeddable;
import org.apache.cayenne.map.EmbeddableAttribute;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import org.apache.cayenne.modeler.event.display.EmbeddableAttributeDisplayEvent;
+import org.apache.cayenne.modeler.event.display.EmbeddableDisplayEvent;
import org.apache.cayenne.validation.ValidationFailure;
public class EmbeddableAttributeErrorMsg extends ValidationDisplayHandler {
@@ -44,15 +45,9 @@ public class EmbeddableAttributeErrorMsg extends ValidationDisplayHandler {
@Override
public void displayField(ProjectController mediator, JFrame frame) {
- EmbeddableAttributeDisplayEvent event = new EmbeddableAttributeDisplayEvent(
- frame,
- embeddable,
- embeddableAttribute,
- map,
- domain);
-
- mediator.displayEmbeddable(event);
- mediator.displayEmbeddableAttribute(event);
+ mediator.displayEmbeddable(new EmbeddableDisplayEvent(frame, domain, map, embeddable));
+ mediator.displayEmbeddableAttribute(new EmbeddableAttributeDisplayEvent(
+ frame, domain, map, embeddable, embeddableAttribute));
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableErrorMsg.java
index a860a67ea..205adf915 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EmbeddableErrorMsg.java
@@ -43,9 +43,9 @@ public class EmbeddableErrorMsg extends ValidationDisplayHandler {
public void displayField(ProjectController mediator, JFrame frame) {
EmbeddableDisplayEvent event = new EmbeddableDisplayEvent(
frame,
- embeddable,
+ domain,
map,
- domain);
+ embeddable);
mediator.displayEmbeddable(event);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EntityErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EntityErrorMsg.java
index b508be7e8..705c7de0f 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EntityErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/EntityErrorMsg.java
@@ -25,13 +25,14 @@ import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
import org.apache.cayenne.validation.ValidationFailure;
/**
* DataDomain validation message.
- *
+ *
*/
public class EntityErrorMsg extends ValidationDisplayHandler {
@@ -50,12 +51,10 @@ public class EntityErrorMsg extends ValidationDisplayHandler {
}
public void displayField(ProjectController mediator, JFrame frame) {
- EntityDisplayEvent event = new EntityDisplayEvent(frame, entity, map, domain);
if (entity instanceof ObjEntity) {
- mediator.displayObjEntity(event);
- }
- else if (entity instanceof DbEntity) {
- mediator.displayDbEntity(event);
+ mediator.displayObjEntity(new ObjEntityDisplayEvent(frame, domain, map, (ObjEntity) entity));
+ } else if (entity instanceof DbEntity) {
+ mediator.displayDbEntity(new DbEntityDisplayEvent(frame, domain, map, (DbEntity) entity));
}
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureErrorMsg.java
index 71227b1f4..752f63e4b 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureErrorMsg.java
@@ -47,10 +47,10 @@ public class ProcedureErrorMsg extends ValidationDisplayHandler {
ProcedureDisplayEvent event = new ProcedureDisplayEvent(
frame,
- procedure,
+ domain,
map,
- domain);
- event.setTabReset(true);
+ procedure,
+ true);
mediator.displayProcedure(event);
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureParameterErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureParameterErrorMsg.java
index f9eaa9bd3..78cf17d58 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureParameterErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/ProcedureParameterErrorMsg.java
@@ -55,21 +55,20 @@ public class ProcedureParameterErrorMsg extends ValidationDisplayHandler {
// (E.g. DbAttributeErrorMsg)
ProcedureDisplayEvent procedureEvent = new ProcedureDisplayEvent(
frame,
- procedure,
+ domain,
map,
- domain);
- procedureEvent.setTabReset(true);
+ procedure,
+ true);
mediator.displayProcedure(procedureEvent);
// now show the failed parameter
ProcedureParameterDisplayEvent event = new ProcedureParameterDisplayEvent(
frame,
- procedureParameter,
- procedure,
+ domain,
map,
- domain);
+ procedure,
+ procedureParameter);
- event.setTabReset(true);
mediator.displayProcedureParameter(event);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/QueryErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/QueryErrorMsg.java
index 6fe9a554a..023d4d690 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/QueryErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/QueryErrorMsg.java
@@ -42,7 +42,7 @@ public class QueryErrorMsg extends ValidationDisplayHandler {
QueryDescriptor query = (QueryDescriptor) object;
DataMap map = query.getDataMap();
- QueryDisplayEvent event = new QueryDisplayEvent(frame, query, map, domain);
+ QueryDisplayEvent event = new QueryDisplayEvent(frame, domain, map, query);
mediator.displayQuery(event);
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/RelationshipErrorMsg.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/RelationshipErrorMsg.java
index de315cd28..45836405e 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/RelationshipErrorMsg.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ui/project/validator/RelationshipErrorMsg.java
@@ -23,16 +23,21 @@ import javax.swing.JFrame;
import org.apache.cayenne.map.DataMap;
import org.apache.cayenne.map.DbEntity;
+import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.ObjEntity;
+import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.map.Relationship;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbRelationshipDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjRelationshipDisplayEvent;
import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.event.display.RelationshipDisplayEvent;
import org.apache.cayenne.validation.ValidationFailure;
/**
* Relationship validation message.
- *
+ *
*/
public class RelationshipErrorMsg extends ValidationDisplayHandler {
@@ -52,22 +57,13 @@ public class RelationshipErrorMsg extends ValidationDisplayHandler {
}
public void displayField(ProjectController mediator, JFrame frame) {
- RelationshipDisplayEvent event = new RelationshipDisplayEvent(
- frame,
- rel,
- entity,
- map,
- domain);
-
- // must first display entity, and then switch to relationship display .. so fire
- // twice
+ // must first display entity, and then switch to relationship display .. so fire twice
if (entity instanceof ObjEntity) {
- mediator.displayObjEntity(event);
- mediator.displayObjRelationship(event);
- }
- else if (entity instanceof DbEntity) {
- mediator.displayDbEntity(event);
- mediator.displayDbRelationship(event);
+ mediator.displayObjEntity(new ObjEntityDisplayEvent(frame, domain, map, (ObjEntity) entity));
+ mediator.displayObjRelationship(new ObjRelationshipDisplayEvent(frame, domain, map, (ObjEntity) entity, (ObjRelationship) rel));
+ } else if (entity instanceof DbEntity) {
+ mediator.displayDbEntity(new DbEntityDisplayEvent(frame, domain, map, (DbEntity) entity));
+ mediator.displayDbRelationship(new DbRelationshipDisplayEvent(frame, domain, map, (DbEntity) entity, (DbRelationship) rel));
}
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
index a53a29e2a..cdf7bf20c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/BaseRemovePropertyUndoableEdit.java
@@ -48,9 +48,9 @@ public abstract class BaseRemovePropertyUndoableEdit extends CayenneUndoableEdit
protected void focusEmbeddable() {
controller.displayEmbeddable(new EmbeddableDisplayEvent(
this,
- embeddable,
+ (DataChannelDescriptor) controller.getProject().getRootNode(),
embeddable.getDataMap(),
- (DataChannelDescriptor) controller.getProject().getRootNode()));
+ embeddable));
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ChangePKGeneratorUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ChangePKGeneratorUndoableEdit.java
index 0b56b4942..9cf9d7121 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ChangePKGeneratorUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/ChangePKGeneratorUndoableEdit.java
@@ -23,7 +23,8 @@ import org.apache.cayenne.modeler.event.model.DbEntityEvent;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbKeyGenerator;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.configuration.DataChannelDescriptor;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
import org.apache.cayenne.modeler.ui.project.ProjectController;
import javax.swing.undo.CannotRedoException;
@@ -77,7 +78,8 @@ public class ChangePKGeneratorUndoableEdit extends CayenneUndoableEdit {
private void fireEvents() {
controller.fireDbEntityEvent(DbEntityEvent.ofChange(this, dbEntity));
- controller.displayDbEntity(new EntityDisplayEvent(this, dbEntity));
+ DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
+ controller.displayDbEntity(new DbEntityDisplayEvent(this, domain, dbEntity.getDataMap(), dbEntity));
}
public boolean hasRealChange() {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateAttributeUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateAttributeUndoableEdit.java
index 9122a65be..6406353eb 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateAttributeUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateAttributeUndoableEdit.java
@@ -30,7 +30,8 @@ import org.apache.cayenne.map.ObjEntity;
import org.apache.cayenne.modeler.ui.action.CreateAttributeAction;
import org.apache.cayenne.modeler.ui.action.RemoveAttributeAction;
import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
public class CreateAttributeUndoableEdit extends CayenneUndoableEdit {
@@ -77,11 +78,11 @@ public class CreateAttributeUndoableEdit extends CayenneUndoableEdit {
objAttr
});
- controller.displayObjEntity(new EntityDisplayEvent(
+ controller.displayObjEntity(new ObjEntityDisplayEvent(
this,
- objEntity,
+ domain,
dataMap,
- domain));
+ objEntity));
}
if (dbEntity != null) {
@@ -89,11 +90,11 @@ public class CreateAttributeUndoableEdit extends CayenneUndoableEdit {
dbAttr
});
- controller.displayDbEntity(new EntityDisplayEvent(
+ controller.displayDbEntity(new DbEntityDisplayEvent(
this,
- dbEntity,
+ domain,
dataMap,
- domain));
+ dbEntity));
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureParameterUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureParameterUndoableEdit.java
index 794e11128..0e8ca9f07 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureParameterUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateProcedureParameterUndoableEdit.java
@@ -57,7 +57,7 @@ public class CreateProcedureParameterUndoableEdit extends CayenneUndoableEdit {
parameter
});
- controller.displayProcedure(new ProcedureDisplayEvent(this, procedure, dataMap, domain));
+ controller.displayProcedure(new ProcedureDisplayEvent(this, domain, dataMap, procedure));
}
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateRelationshipUndoableEdit.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateRelationshipUndoableEdit.java
index 84fefdfc7..9986922cb 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateRelationshipUndoableEdit.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/undo/CreateRelationshipUndoableEdit.java
@@ -29,7 +29,8 @@ import org.apache.cayenne.map.ObjRelationship;
import org.apache.cayenne.modeler.ui.action.CreateRelationshipAction;
import org.apache.cayenne.modeler.ui.action.RemoveRelationshipAction;
import org.apache.cayenne.modeler.ui.project.ProjectController;
-import org.apache.cayenne.modeler.event.display.EntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.DbEntityDisplayEvent;
+import org.apache.cayenne.modeler.event.display.ObjEntityDisplayEvent;
public class CreateRelationshipUndoableEdit extends CayenneUndoableEdit {
@@ -79,21 +80,15 @@ public class CreateRelationshipUndoableEdit extends CayenneUndoableEdit {
RemoveRelationshipAction action = globalActions
.getAction(RemoveRelationshipAction.class);
+ DataChannelDescriptor domain = (DataChannelDescriptor) controller.getProject().getRootNode();
if (objEnt != null) {
action.removeObjRelationships(objEnt, objectRel);
- controller.displayObjEntity(new EntityDisplayEvent(
- this,
- objEnt,
- objEnt.getDataMap(),
- (DataChannelDescriptor) controller.getProject().getRootNode()));
+ controller.displayObjEntity(new ObjEntityDisplayEvent(this, domain, objEnt.getDataMap(), objEnt));
}
if (dbEnt != null) {
action.removeDbRelationships(dbEnt, dbRel);
- controller.displayDbEntity(new EntityDisplayEvent(this, dbEnt, dbEnt
- .getDataMap(), (DataChannelDescriptor) controller
- .getProject()
- .getRootNode()));
+ controller.displayDbEntity(new DbEntityDisplayEvent(this, domain, dbEnt.getDataMap(), dbEnt));
}
}
}