CONTEXT MENU: restore some context menu

- Restored some context menu: close/delete/refresh
- There is a lot of VOC of removing context menu of Project Explorer, so
decided to restore some menus.

Change-Id: Id10ade67654629e1f00b6b833c4efcb59cc8b544
Signed-off-by: Hyeongseok <harry.heo@samsung.com>

diff --git a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java
index 44a37ed..d65679b 100644 (file)
--- a/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java
+++ b/bundles/org.eclipse.ui.navigator.resources/src/org/eclipse/ui/internal/navigator/resources/actions/ResourceMgmtActionProvider.java
@@ -11,6 +11,10 @@
 /* 2016-07-19 Hyeongseok Heo <harry.heo@samsung.com>
  * Modifications by S-Core Co., Ltd.
  * 1. Remove project context menu
+ *
+ * 2016-11-22 Hyeongseok Heo <harry.heo@samsung.com>
+ * 2. Restore below menus
+ *      - Refresh / Open / Close
  */
 package org.eclipse.ui.internal.navigator.resources.actions;
 
@@ -165,6 +169,20 @@ public class ResourceMgmtActionProvider extends CommonActionProvider {
                        }
                }
                */
+               if (!hasClosedProjects) {
+                       refreshAction.selectionChanged(selection);
+                       menu.appendToGroup(ICommonMenuConstants.GROUP_REORGANIZE, refreshAction);
+               }
+               if (isProjectSelection) {
+                       if (hasClosedProjects) {
+                               openProjectAction.selectionChanged(selection);
+                               menu.appendToGroup(ICommonMenuConstants.GROUP_REORGANIZE, openProjectAction);
+                       }
+                       if (hasOpenProjects) {
+                               closeProjectAction.selectionChanged(selection);
+                               menu.appendToGroup(ICommonMenuConstants.GROUP_REORGANIZE, closeProjectAction);
+                       }
+               }
                /* ===== */
        }
 

diff --git a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/TizenMenuManager.java b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/TizenMenuManager.java
index a91cf2e..2b36717 100644 (file)
--- a/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/TizenMenuManager.java
+++ b/bundles/org.eclipse.ui.navigator/src/org/eclipse/ui/navigator/TizenMenuManager.java
@@ -37,17 +37,15 @@ import org.eclipse.jface.action.MenuManager;
  * Export<br>
  * Copy<br>
  * Paste<br>
- * Delete<br>
  * Restore from Local History<br>
- * Team<br>
  * Compare With<br>
  * Replace With<br>
  * </ol>
  * </ol>
- *
+ * @see {@linkplain org.eclipse.ui.internal.navigator.resources.actions.ResourceMgmtActionProvider}
  * @since 3.6
- *
  */
+@SuppressWarnings("javadoc")
 public class TizenMenuManager extends MenuManager {
 
     /**
@@ -63,13 +61,6 @@ public class TizenMenuManager extends MenuManager {
      */
     @Override
     public void appendToGroup(String groupName, IAction action) {
-        /* FIXME Remove below System.out log
-         * @author Hyeongseok Heo <harry.heo@samsung.com>
-         * @since 2016-08-05
-         */
-        // System.out.printf("###TizenMenuManager appendToGroup1 groupName:%s\tactionId:%s\tdefId:%s\ttext:%s\n", //$NON-NLS-1$
-        // groupName, action.getId(), action.getActionDefinitionId(), action.getText());
-
         // Hide Copy Quilified Name
         if (ICommonMenuConstants.GROUP_EDIT.equals(groupName)
                 && "org.eclipse.wst.jsdt.ui.edit.text.java.copy.qualified.name" //$NON-NLS-1$
@@ -81,8 +72,16 @@ public class TizenMenuManager extends MenuManager {
                 || "export".equals(action.getId()))) { //$NON-NLS-1$
             return;
         }
-        // Hide Edit menus (Copy, Paste, Delete)
+        /* Hide Edit menus (Copy, Paste, Delete)
+         * => Restore Delete
+         * @author Hyeongseok Heo <harry.heo@samsung.com>
+         * @since 2016-11-21
+         */
         if (ICommonMenuConstants.GROUP_EDIT.equals(groupName)) {
+            if ("org.eclipse.ui.edit.delete".equals(action.getActionDefinitionId())) { //$NON-NLS-1$
+                super.appendToGroup("group.reorganize", action); //$NON-NLS-1$
+                return;
+            }
             return;
         }
 
@@ -95,20 +94,18 @@ public class TizenMenuManager extends MenuManager {
      */
     @Override
     public void insert(int index, IContributionItem item) {
-        /* FIXME Remove below System.out log
-         * @author Hyeongseok Heo <harry.heo@samsung.com>
-         * @since 2016-08-05
-         */
-        // System.out.println("=TizenMenuManager insert: index:" + index + "\titem:" + item.getId()); //$NON-NLS-1$//$NON-NLS-2$
         if (isRegrouping(item)) {
             return;
         }
         super.insert(index, item);
     }
 
-    /**
+    /*
+     * Check if parameter item should be regrouping as Tizen rule.
+     * If item id equals to reserved id, change the group of the item and return true
+     *
      * @param item
-     * @return
+     * @return true if item id is equal to reserved id.
      */
     private boolean isRegrouping(IContributionItem item) {
         // Regrouping Native SA menus
@@ -142,12 +139,6 @@ public class TizenMenuManager extends MenuManager {
      */
     @Override
     public void insertAfter(String ID, IContributionItem item) {
-        /* FIXME Remove below System.out log
-         * @author Hyeongseok Heo <harry.heo@samsung.com>
-         * @since 2016-08-05
-         */
-        // System.out.printf("=TizenMenuManager insertAfter ID:%s\titemId:%s\tisGroup:%s\n", ID, item.getId(), //$NON-NLS-1$
-        // item.isGroupMarker());
         if (isHideItem(ID, item)) {
             return;
         }
@@ -159,7 +150,6 @@ public class TizenMenuManager extends MenuManager {
 
     /**
      * Regrouping menus as Tizen rule
-     *
      * @param iD
      * @param item
      * @return
@@ -199,7 +189,6 @@ public class TizenMenuManager extends MenuManager {
 
     /**
      * Check and hide menu by Tizen rule
-     *
      * @param item
      * @param id
      * @return