You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by ab...@apache.org on 2019/06/12 13:14:06 UTC
[cayenne] branch STABLE-4.1 updated: CAY-2417 Modeler: wrong title
in attribute context menu
This is an automated email from the ASF dual-hosted git repository.
abulatski pushed a commit to branch STABLE-4.1
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/STABLE-4.1 by this push:
new 6aa3012 CAY-2417 Modeler: wrong title in attribute context menu
6aa3012 is described below
commit 6aa30128533e92b01866c66cda56131cc6f2c9d0
Author: Arseni Bulatski <an...@gmail.com>
AuthorDate: Wed Jun 12 15:20:00 2019 +0300
CAY-2417 Modeler: wrong title in attribute context menu
(cherry picked from commit 1ec001703a6cc1647d0ad8145b28877121798823)
---
RELEASE-NOTES.txt | 1 +
.../editor/dbentity/DbEntityAttributePanel.java | 32 ++++++++++++++--------
.../editor/dbentity/DbEntityRelationshipPanel.java | 9 ++++++
3 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
index 4e8935c..286e2a7 100644
--- a/RELEASE-NOTES.txt
+++ b/RELEASE-NOTES.txt
@@ -14,6 +14,7 @@ Date:
Bug Fixes:
+CAY-2417 Modeler: wrong title in attribute context menu
CAY-2553 Wrong disjoint prefetch query qualifier
CAY-2573 DI field injection is triggered when creating sql Driver
CAY-2580 Cgen: Can't use custom templates for client mode
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java
index 6989f24..5c96a16 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityAttributePanel.java
@@ -18,6 +18,17 @@
****************************************************************/
package org.apache.cayenne.modeler.editor.dbentity;
+import javax.swing.JComboBox;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableColumn;
+import java.awt.BorderLayout;
+import java.util.List;
+
import org.apache.cayenne.dba.TypesMapping;
import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
@@ -41,17 +52,6 @@ import org.apache.cayenne.modeler.util.UIUtil;
import org.apache.cayenne.modeler.util.combo.AutoCompletion;
import org.apache.cayenne.swing.components.LimitedTextField;
-import javax.swing.JComboBox;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableColumn;
-import java.awt.BorderLayout;
-import java.util.List;
-
/**
* Detail view of the DbEntity attributes.
*/
@@ -120,6 +120,16 @@ public class DbEntityAttributePanel extends JPanel implements DbEntityDisplayLis
List<?> listAttrs = model.getObjectList();
int[] newSel = new int[attrs.length];
+ Application.getInstance().getActionManager()
+ .getAction(RemoveAttributeRelationshipAction.class)
+ .setCurrentSelectedPanel(parentPanel.getAttributePanel());
+ Application.getInstance().getActionManager()
+ .getAction(CutAttributeRelationshipAction.class)
+ .setCurrentSelectedPanel(parentPanel.getAttributePanel());
+ Application.getInstance().getActionManager()
+ .getAction(CopyAttributeRelationshipAction.class)
+ .setCurrentSelectedPanel(parentPanel.getAttributePanel());
+
parentPanel.updateActions(attrs);
for (int i = 0; i < attrs.length; i++) {
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java
index 2307ef9..7080a69 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/editor/dbentity/DbEntityRelationshipPanel.java
@@ -179,6 +179,15 @@ public class DbEntityRelationshipPanel extends JPanel implements DbEntityDisplay
List listRels = model.getObjectList();
int[] newSel = new int[rels.length];
+ Application.getInstance().getActionManager()
+ .getAction(RemoveAttributeRelationshipAction.class)
+ .setCurrentSelectedPanel(parentPanel.getRelationshipPanel());
+ Application.getInstance().getActionManager()
+ .getAction(CutAttributeRelationshipAction.class)
+ .setCurrentSelectedPanel(parentPanel.getRelationshipPanel());
+ Application.getInstance().getActionManager()
+ .getAction(CopyAttributeRelationshipAction.class)
+ .setCurrentSelectedPanel(parentPanel.getRelationshipPanel());
parentPanel.updateActions(rels);
for (int i = 0; i < rels.length; i++) {