Repository: cayenne Updated Branches: refs/heads/master 175ec07f6 -> c7f5a699f
CAY-2322 'Remove DataDomain' button does not work Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/71788995 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/71788995 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/71788995 Branch: refs/heads/master Commit: 717889955e490ff98045fa4989288ce5fbf16707 Parents: c299812 Author: Anton Dreka <drek...@gmail.com> Authored: Mon May 29 16:50:31 2017 +0300 Committer: Anton Dreka <drek...@gmail.com> Committed: Mon May 29 16:50:31 2017 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/cayenne/modeler/ProjectTreeView.java | 1 - .../org/apache/cayenne/modeler/action/DefaultActionManager.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/71788995/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 1fd6f62..9e38d81 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 @@ -1000,7 +1000,6 @@ public class ProjectTreeView extends JTree implements DomainDisplayListener, popup.add(buildMenu(DbEntitySyncAction.class)); popup.add(buildMenu(LinkDataMapsAction.class)); popup.add(buildMenu(RemoveAction.class)); - popup.addSeparator(); popup.add(buildMenu(CutAction.class)); popup.add(buildMenu(CopyAction.class)); popup.add(buildMenu(PasteAction.class)); http://git-wip-us.apache.org/repos/asf/cayenne/blob/71788995/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java ---------------------------------------------------------------------- diff --git a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java index 5e170ef..ed865f9 100644 --- a/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java +++ b/modeler/cayenne-modeler/src/main/java/org/apache/cayenne/modeler/action/DefaultActionManager.java @@ -160,7 +160,6 @@ public class DefaultActionManager implements ActionManager { DOMAIN_ACTIONS.addAll(Arrays.asList( ImportDataMapAction.class.getName(), CreateDataMapAction.class.getName(), - RemoveAction.class.getName(), CreateNodeAction.class.getName(), ReverseEngineeringAction.class.getName(), ImportEOModelAction.class.getName(), @@ -180,6 +179,7 @@ public class DefaultActionManager implements ActionManager { CreateQueryAction.class.getName(), CreateProcedureAction.class.getName(), MigrateAction.class.getName(), + RemoveAction.class.getName(), InferRelationshipsAction.class.getName(), CutAction.class.getName(), CopyAction.class.getName()));
