You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by nt...@apache.org on 2017/05/25 12:58:36 UTC
[1/3] cayenne git commit: CAY-2313 DbEntity. 'Sync Dependent
ObjEntities with DbEntity' is lost in the context menu
Repository: cayenne
Updated Branches:
refs/heads/master cbfd67830 -> 65a1fad65
CAY-2313 DbEntity. 'Sync Dependent ObjEntities with DbEntity' is lost in the context menu
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/f318fe4a
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/f318fe4a
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/f318fe4a
Branch: refs/heads/master
Commit: f318fe4ab6d6ff4ef78d77a10bb9c1ebf2271ef6
Parents: 09b0fdb
Author: Anton Dreka <dr...@gmail.com>
Authored: Thu May 25 13:44:34 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Thu May 25 13:44:34 2017 +0300
----------------------------------------------------------------------
.../cayenne/modeler/CayenneModelerFrame.java | 2 ++
.../apache/cayenne/modeler/ProjectTreeView.java | 25 +++++++++++++-------
.../modeler/action/DbEntitySyncAction.java | 10 ++++++++
3 files changed, 29 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f318fe4a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
index daefadc..56c949d 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
@@ -62,6 +62,7 @@ import org.apache.cayenne.modeler.action.CreateObjEntityAction;
import org.apache.cayenne.modeler.action.CreateProcedureAction;
import org.apache.cayenne.modeler.action.CreateQueryAction;
import org.apache.cayenne.modeler.action.CutAction;
+import org.apache.cayenne.modeler.action.DbEntitySyncAction;
import org.apache.cayenne.modeler.action.DocumentationAction;
import org.apache.cayenne.modeler.action.ExitAction;
import org.apache.cayenne.modeler.action.FindAction;
@@ -229,6 +230,7 @@ public class CayenneModelerFrame extends JFrame implements DataNodeDisplayListen
projectMenu.addSeparator();
projectMenu.add(getAction(ObjEntitySyncAction.class).buildMenu());
+ projectMenu.add(getAction(DbEntitySyncAction.class).buildMenu());
projectMenu.addSeparator();
projectMenu.add(getAction(RemoveAction.class).buildMenu());
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f318fe4a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index ead0183..b6116ed 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -52,6 +52,7 @@ import org.apache.cayenne.modeler.action.CreateObjEntityAction;
import org.apache.cayenne.modeler.action.CreateProcedureAction;
import org.apache.cayenne.modeler.action.CreateQueryAction;
import org.apache.cayenne.modeler.action.CutAction;
+import org.apache.cayenne.modeler.action.DbEntitySyncAction;
import org.apache.cayenne.modeler.action.LinkDataMapsAction;
import org.apache.cayenne.modeler.action.ObjEntitySyncAction;
import org.apache.cayenne.modeler.action.PasteAction;
@@ -84,12 +85,7 @@ import org.apache.cayenne.swing.components.TopBorder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.swing.Action;
-import javax.swing.JMenuItem;
-import javax.swing.JPopupMenu;
-import javax.swing.JTree;
-import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
+import javax.swing.*;
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
@@ -995,9 +991,8 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
popup.add(buildMenu(CreateQueryAction.class));
popup.addSeparator();
popup.add(buildMenu(ObjEntitySyncAction.class));
- popup.addSeparator();
+ popup.add(buildMenu(DbEntitySyncAction.class));
popup.add(buildMenu(LinkDataMapsAction.class));
- popup.addSeparator();
popup.add(buildMenu(RemoveAction.class));
popup.addSeparator();
popup.add(buildMenu(CutAction.class));
@@ -1054,6 +1049,7 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
if (popup == null) {
popup = createJPopupMenu();
}
+ popupMenuFilter();
popup.show(ProjectTreeView.this, e.getX(), e.getY());
}
}
@@ -1121,6 +1117,19 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener,
}
+ // Filter all disabled actions in popupMenu, but skip Cut-Copy-Paste block. It should always exist.
+ public void popupMenuFilter() {
+ Action cutAction = mediator.getApplication().getActionManager().getAction(CutAction.class);
+ for (MenuElement element : popup.getSubElements()) {
+ JMenuItem item = (JMenuItem) element;
+ if (!item.getAction().equals(cutAction)) {
+ item.setVisible(item.isEnabled());
+ } else {
+ break;
+ }
+ }
+ }
+
public TreeDragSource getTds() {
return tds;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/f318fe4a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
index 8544180..b774233 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DbEntitySyncAction.java
@@ -33,7 +33,10 @@ import org.apache.cayenne.modeler.dialog.objentity.EntitySyncController;
import org.apache.cayenne.modeler.undo.DbEntitySyncUndoableEdit;
import org.apache.cayenne.modeler.util.CayenneAction;
+import javax.swing.*;
+import java.awt.*;
import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
import java.util.Collection;
import java.util.Iterator;
@@ -51,6 +54,13 @@ public class DbEntitySyncAction extends CayenneAction {
super(getActionName(), application);
}
+ @Override
+ public KeyStroke getAcceleratorKey() {
+ return KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit
+ .getDefaultToolkit()
+ .getMenuShortcutKeyMask());
+ }
+
public String getIconName() {
return "icon-sync.png";
}
[3/3] cayenne git commit: Merge remote-tracking branch
'remotes/parent/pr/219' into asf-master
Posted by nt...@apache.org.
Merge remote-tracking branch 'remotes/parent/pr/219' into asf-master
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/65a1fad6
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/65a1fad6
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/65a1fad6
Branch: refs/heads/master
Commit: 65a1fad6500612a3b750f52756e67755c42969c1
Parents: cbfd678 629937f
Author: Nikita Timofeev <st...@gmail.com>
Authored: Thu May 25 14:40:48 2017 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Thu May 25 14:40:48 2017 +0300
----------------------------------------------------------------------
.../cayenne/modeler/CayenneModelerFrame.java | 2 ++
.../apache/cayenne/modeler/ProjectTreeView.java | 19 +++++++++++++++++--
.../modeler/action/DbEntitySyncAction.java | 10 ++++++++++
3 files changed, 29 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/65a1fad6/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/CayenneModelerFrame.java
----------------------------------------------------------------------
[2/3] cayenne git commit: CAY-2313 DbEntity. 'Sync Dependent
ObjEntities with DbEntity' is lost in the context menu
Posted by nt...@apache.org.
CAY-2313 DbEntity. 'Sync Dependent ObjEntities with DbEntity' is lost in the context menu
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/629937f1
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/629937f1
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/629937f1
Branch: refs/heads/master
Commit: 629937f1466b6aed91b7e1da51c2db9da258700e
Parents: f318fe4
Author: Anton Dreka <dr...@gmail.com>
Authored: Thu May 25 13:48:39 2017 +0300
Committer: Anton Dreka <dr...@gmail.com>
Committed: Thu May 25 13:48:39 2017 +0300
----------------------------------------------------------------------
.../java/org/apache/cayenne/modeler/ProjectTreeView.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/629937f1/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
----------------------------------------------------------------------
diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
index b6116ed..1fd6f62 100644
--- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
+++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java
@@ -85,7 +85,13 @@ import org.apache.cayenne.swing.components.TopBorder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.swing.*;
+import javax.swing.Action;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+import javax.swing.JTree;
+import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
+import javax.swing.MenuElement;
import javax.swing.event.TreeExpansionEvent;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;