Added rename to sysdyn browser context menu.

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@14996 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/icons/cross.png b/org.simantics.sysdyn.ui/icons/cross.png
new file mode 100644 (file)
index 0000000..1514d51
Binary files /dev/null and b/org.simantics.sysdyn.ui/icons/cross.png differ

diff --git a/org.simantics.sysdyn.ui/icons/textfield_rename.png b/org.simantics.sysdyn.ui/icons/textfield_rename.png
new file mode 100644 (file)
index 0000000..4e3688e
Binary files /dev/null and b/org.simantics.sysdyn.ui/icons/textfield_rename.png differ

diff --git a/org.simantics.sysdyn.ui/plugin.xml b/org.simantics.sysdyn.ui/plugin.xml
index c69064e886c9e792a66da7f0f4c43f50cbc3d169..9c99c0d199dee4f0e6ab36c69200b186102c5cb4 100644 (file)
--- a/org.simantics.sysdyn.ui/plugin.xml
+++ b/org.simantics.sysdyn.ui/plugin.xml
@@ -126,10 +126,20 @@
                id="org.simantics.sysdyn.ui.browser.openWithMenu">\r
          </dynamic>\r
          <command\r
-               commandId="org.simantics.sysdyn.ui.deleteItem"\r
-               label="Delete"\r
-               style="push"\r
-               tooltip="Remove from database">\r
+               commandId="org.simantics.sysdyn.ui.renameNode"\r
+               icon="icons/textfield_rename.png"\r
+               id="org.simantics.sysdyn.ui.browser.rename"\r
+               label="Rename"\r
+               style="push">\r
+            <visibleWhen checkEnabled="true">\r
+            </visibleWhen>\r
+         </command>\r
+         <command\r
+               commandId="org.simantics.sysdyn.ui.removeNode"\r
+               icon="icons/cross.png"\r
+               id="org.simantics.sysdyn.ui.browser.remove"\r
+               label="Remove"\r
+               style="push">\r
             <visibleWhen checkEnabled="true">\r
             </visibleWhen>\r
          </command>\r
@@ -161,6 +171,7 @@
          </menu>\r
          <command\r
                commandId="org.simantics.sysdyn.ui.rename"\r
+               icon="icons/textfield_rename.png"\r
                label="Rename"\r
                style="push">\r
             <visibleWhen\r
@@ -169,6 +180,7 @@
          </command>\r
          <command\r
                commandId="org.simantics.sysdyn.ui.remove"\r
+               icon="icons/cross.png"\r
                label="Remove"\r
                style="push">\r
             <visibleWhen\r
@@ -218,8 +230,12 @@
             name="Rename">\r
       </command>\r
       <command\r
-            id="org.simantics.sysdyn.ui.deleteItem"\r
-            name="Delete Item">\r
+            id="org.simantics.sysdyn.ui.removeNode"\r
+            name="Remove Node">\r
+      </command>\r
+      <command\r
+            id="org.simantics.sysdyn.ui.renameNode"\r
+            name="Rename Node">\r
       </command>\r
       <command\r
             defaultHandler="org.simantics.sysdyn.ui.actions.ToggleSimulation"\r
@@ -238,8 +254,21 @@
             commandId="org.simantics.sysdyn.ui.trend.view.pin">\r
       </handler>\r
       <handler\r
-            class="org.simantics.sysdyn.ui.handlers.UnlinkItemHandler"\r
-            commandId="org.simantics.sysdyn.ui.deleteItem">\r
+            class="org.simantics.sysdyn.ui.handlers.UnlinkNodeHandler"\r
+            commandId="org.simantics.sysdyn.ui.removeNode">\r
+         <activeWhen>\r
+            <with\r
+                  variable="selection">\r
+               <test\r
+                     args="http://www.simantics.org/Sysdyn-1.0/Configuration"\r
+                     property="org.simantics.graph.resourceType">\r
+               </test>\r
+            </with>\r
+         </activeWhen>\r
+      </handler>\r
+      <handler\r
+            class="org.simantics.sysdyn.ui.handlers.RenameNodeHandler"\r
+            commandId="org.simantics.sysdyn.ui.renameNode">\r
          <activeWhen>\r
             <with\r
                   variable="selection">\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/DeleteItemHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java
similarity index 93%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/DeleteItemHandler.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java
index ae26afc60eb1a011b72028585cbb80274ecf3b72..0750d572457833e495f93e56255ebb422c5567e9 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/DeleteItemHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RemoveNodeHandler.java
@@ -31,7 +31,7 @@ import org.simantics.utils.ui.ExceptionUtils;
 /**\r
  * @author Tuukka Lehtonen\r
  */\r
-public class DeleteItemHandler extends AbstractHandler {\r
+public class RemoveNodeHandler extends AbstractHandler {\r
 \r
     @Override\r
     public Object execute(ExecutionEvent event) throws ExecutionException {\r
@@ -41,7 +41,7 @@ public class DeleteItemHandler extends AbstractHandler {
         if (resources.length == 0)\r
             return null;\r
 \r
-        MessageDialog dialog = new MessageDialog(shell, "Delete Item", null, "Are you sure?", 0,\r
+        MessageDialog dialog = new MessageDialog(shell, "Remove Item", null, "Are you sure?", 0,\r
                 new String[] { "OK", "Cancel" }, 0);\r
         dialog.create();\r
         if (dialog.open() == 0)\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RenameNodeHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RenameNodeHandler.java
new file mode 100644 (file)
index 0000000..7e836b5
--- /dev/null
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/RenameNodeHandler.java
@@ -0,0 +1,44 @@
+/*******************************************************************************\r
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
+ * in Industry THTH ry.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the terms of the Eclipse Public License v1.0\r
+ * which accompanies this distribution, and is available at\r
+ * http://www.eclipse.org/legal/epl-v10.html\r
+ *\r
+ * Contributors:\r
+ *     VTT Technical Research Centre of Finland - initial API and implementation\r
+ *******************************************************************************/\r
+package org.simantics.sysdyn.ui.handlers;\r
+\r
+import org.eclipse.core.commands.AbstractHandler;\r
+import org.eclipse.core.commands.ExecutionEvent;\r
+import org.eclipse.core.commands.ExecutionException;\r
+import org.eclipse.jface.viewers.ISelection;\r
+import org.eclipse.ui.IWorkbenchPart;\r
+import org.eclipse.ui.handlers.HandlerUtil;\r
+import org.simantics.browsing.ui.GraphExplorer;\r
+import org.simantics.browsing.ui.NodeContext;\r
+import org.simantics.browsing.ui.common.ColumnKeys;\r
+import org.simantics.utils.ui.ISelectionUtils;\r
+\r
+public class RenameNodeHandler extends AbstractHandler {\r
+\r
+    @Override\r
+    public Object execute(ExecutionEvent event) throws ExecutionException {\r
+        ISelection sel = HandlerUtil.getCurrentSelection(event);\r
+        NodeContext ctx = ISelectionUtils.filterSingleSelection(sel, NodeContext.class);\r
+        if (ctx == null)\r
+            return null;\r
+\r
+        IWorkbenchPart part = HandlerUtil.getActivePart(event);\r
+        if (part == null)\r
+            return null;\r
+\r
+        GraphExplorer graphExplorer = (GraphExplorer) part.getAdapter(GraphExplorer.class);\r
+        if (graphExplorer != null)\r
+            graphExplorer.startEditing(ctx, ColumnKeys.SINGLE);\r
+\r
+        return null;\r
+    }\r
+}\r

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/UnlinkItemHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/UnlinkNodeHandler.java
similarity index 93%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/UnlinkItemHandler.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/UnlinkNodeHandler.java
index 3fe12bb2d8e4a2f1af0c19eb426c421ecb34342c..9c65ec2e0d445aa04dfd306272c854efe74ba810 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/UnlinkItemHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/handlers/UnlinkNodeHandler.java
@@ -31,7 +31,7 @@ import org.simantics.utils.ui.ExceptionUtils;
 /**\r
  * @author Tuukka Lehtonen\r
  */\r
-public class UnlinkItemHandler extends AbstractHandler {\r
+public class UnlinkNodeHandler extends AbstractHandler {\r
 \r
     @Override\r
     public Object execute(ExecutionEvent event) throws ExecutionException {\r
@@ -41,7 +41,7 @@ public class UnlinkItemHandler extends AbstractHandler {
         if (resources.length == 0)\r
             return null;\r
 \r
-        MessageDialog dialog = new MessageDialog(shell, "Delete Item", null, "Are you sure?", 0,\r
+        MessageDialog dialog = new MessageDialog(shell, "Remove Item", null, "Are you sure?", 0,\r
                 new String[] { "OK", "Cancel" }, 0);\r
         dialog.create();\r
         if (dialog.open() == 0)\r