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/04/19 15:47:57 UTC
(cayenne) 02/08: Modeler cleanup
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 7cf5faba5c753aaee1b1b919d4e7bc27908b7b60
Author: Andrus Adamchik <an...@objectstyle.com>
AuthorDate: Sat Apr 18 15:45:47 2026 -0400
Modeler cleanup
removing ProjectController.setCurrentXyz. Object disolay changes should go through the "fire.." methods
---
.../apache/cayenne/modeler/ProjectController.java | 16 ----------
.../modeler/editor/ObjEntityAttributePanel.java | 16 ++++++++--
.../modeler/editor/ObjEntityRelationshipPanel.java | 16 ++++++++--
.../event/ObjRelationshipDisplayListener.java | 11 +++----
.../modeler/event/RelationshipDisplayEvent.java | 36 +++++++++-------------
5 files changed, 47 insertions(+), 48 deletions(-)
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
index f9d92d08a..d21c235e7 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectController.java
@@ -1437,8 +1437,6 @@ public class ProjectController extends CayenneController {
public void fireObjRelationshipDisplayEvent(RelationshipDisplayEvent e) {
boolean changed = !Arrays.equals(e.getRelationships(), currentState.objRels);
- e.setRelationshipChanged(changed);
-
if (changed) {
if (e.getEntity() != currentState.objEntity) {
clearState();
@@ -1733,20 +1731,6 @@ public class ProjectController extends CayenneController {
application.getActionManager().getAction(SaveAsAction.class).setEnabled(enable);
}
- /**
- * Set currently selected ObjAttributes
- */
- public void setCurrentObjAttributes(ObjAttribute[] attrs) {
- currentState.objAttrs = attrs;
- }
-
- /**
- * Set currently selected ObjRelationships
- */
- public void setCurrentObjRelationships(ObjRelationship[] rels) {
- currentState.objRels = rels;
- }
-
/**
* Set currently selected DbAttributes
*/
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
index 27e16eaf8..a27ecd664 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityAttributePanel.java
@@ -37,6 +37,7 @@ import org.apache.cayenne.modeler.action.PasteAction;
import org.apache.cayenne.modeler.action.RemoveAttributeRelationshipAction;
import org.apache.cayenne.modeler.dialog.objentity.ObjAttributeInfoDialog;
import org.apache.cayenne.modeler.editor.wrapper.ObjAttributeWrapper;
+import org.apache.cayenne.modeler.event.AttributeDisplayEvent;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
import org.apache.cayenne.modeler.event.ObjEntityDisplayListener;
import org.apache.cayenne.modeler.event.ProjectOnSaveEvent;
@@ -457,9 +458,14 @@ public class ObjEntityAttributePanel extends JPanel implements ObjEntityDisplayL
}
private void valueChanged(ListSelectionEvent e) {
+
+ if (e.getValueIsAdjusting()) {
+ return;
+ }
+
ObjAttribute[] attrs = new ObjAttribute[0];
- if (!e.getValueIsAdjusting() && !((ListSelectionModel) e.getSource()).isSelectionEmpty()) {
+ if (!((ListSelectionModel) e.getSource()).isSelectionEmpty()) {
parentPanel.getRelationshipPanel().getTable().getSelectionModel().clearSelection();
if (parentPanel.getRelationshipPanel().getTable().getCellEditor() != null) {
@@ -491,7 +497,13 @@ public class ObjEntityAttributePanel extends JPanel implements ObjEntityDisplayL
editMenu.setEnabled(table.getSelectedRow() >= 0);
}
- controller.setCurrentObjAttributes(attrs);
+ controller.fireObjAttributeDisplayEvent(new AttributeDisplayEvent(
+ this,
+ attrs,
+ controller.getCurrentObjEntity(),
+ controller.getCurrentDataMap(),
+ controller.getCurrentDataChanel()));
+
parentPanel.updateActions(attrs);
}
}
\ No newline at end of file
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
index 27e56c783..b4a7091e3 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/ObjEntityRelationshipPanel.java
@@ -36,6 +36,7 @@ import org.apache.cayenne.modeler.action.RemoveAttributeRelationshipAction;
import org.apache.cayenne.modeler.dialog.objentity.ObjRelationshipInfo;
import org.apache.cayenne.modeler.event.EntityDisplayEvent;
import org.apache.cayenne.modeler.event.ObjEntityDisplayListener;
+import org.apache.cayenne.modeler.event.RelationshipDisplayEvent;
import org.apache.cayenne.modeler.event.TablePopupHandler;
import org.apache.cayenne.modeler.pref.TableColumnPreferences;
import org.apache.cayenne.modeler.util.CayenneTable;
@@ -404,9 +405,14 @@ public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDispl
}
private void valueChanged(ListSelectionEvent e) {
+
+ if (e.getValueIsAdjusting()) {
+ return;
+ }
+
ObjRelationship[] rels = new ObjRelationship[0];
- if (!e.getValueIsAdjusting() && !((ListSelectionModel) e.getSource()).isSelectionEmpty()) {
+ if (!((ListSelectionModel) e.getSource()).isSelectionEmpty()) {
parentPanel.getAttributePanel().getTable().getSelectionModel().clearSelection();
if (parentPanel.getAttributePanel().getTable().getCellEditor() != null) {
@@ -438,7 +444,13 @@ public class ObjEntityRelationshipPanel extends JPanel implements ObjEntityDispl
editMenu.setEnabled(table.getSelectedRow() >= 0);
}
- controller.setCurrentObjRelationships(rels);
+ controller.fireObjRelationshipDisplayEvent(new RelationshipDisplayEvent(
+ this,
+ rels,
+ controller.getCurrentObjEntity(),
+ controller.getCurrentDataMap(),
+ controller.getCurrentDataChanel()));
+
parentPanel.updateActions(rels);
}
}
\ No newline at end of file
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ObjRelationshipDisplayListener.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ObjRelationshipDisplayListener.java
index 56916ed4e..4eca1e44a 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ObjRelationshipDisplayListener.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/ObjRelationshipDisplayListener.java
@@ -22,11 +22,10 @@ package org.apache.cayenne.modeler.event;
import java.util.EventListener;
/**
-* Used to display ObjRelationship.
-*/
-public interface ObjRelationshipDisplayListener extends EventListener
-{
- /** Current obj entity used as a model has changed.*/
- public void currentObjRelationshipChanged(RelationshipDisplayEvent e);
+ * Used to display ObjRelationship.
+ */
+public interface ObjRelationshipDisplayListener extends EventListener {
+
+ void currentObjRelationshipChanged(RelationshipDisplayEvent e);
}
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/RelationshipDisplayEvent.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/RelationshipDisplayEvent.java
index 5b20f38f1..dd951192c 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/RelationshipDisplayEvent.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/event/RelationshipDisplayEvent.java
@@ -25,40 +25,32 @@ import org.apache.cayenne.map.Entity;
import org.apache.cayenne.map.Relationship;
public class RelationshipDisplayEvent extends EntityDisplayEvent {
- protected Relationship<?,?,?>[] relationships;
- protected boolean relationshipChanged = true;
-
+
+ private final Relationship<?, ?, ?>[] relationships;
+
public RelationshipDisplayEvent(
Object src,
- Relationship<?,?,?> relationship,
- Entity<?,?,?> entity,
+ Relationship<?, ?, ?> relationship,
+ Entity<?, ?, ?> entity,
DataMap map,
DataChannelDescriptor domain) {
- super(src, entity, map, domain);
- this.relationships = new Relationship[] { relationship };
+ super(src, entity, map, domain);
+ this.relationships = new Relationship[]{relationship};
}
public RelationshipDisplayEvent(
- Object src,
- Relationship<?,?,?>[] relationships,
- Entity<?,?,?> entity,
- DataMap map,
- DataChannelDescriptor domain) {
+ Object src,
+ Relationship<?, ?, ?>[] relationships,
+ Entity<?, ?, ?> entity,
+ DataMap map,
+ DataChannelDescriptor domain) {
super(src, entity, map, domain);
this.relationships = relationships;
}
-
- public Relationship<?,?,?>[] getRelationships() {
- return relationships;
- }
- public boolean isRelationshipChanged() {
- return relationshipChanged;
- }
-
- public void setRelationshipChanged(boolean temp) {
- relationshipChanged = temp;
+ public Relationship<?, ?, ?>[] getRelationships() {
+ return relationships;
}
}