Fix Bug 412875
- Adjust the Group menu
Change-Id: I063b8d0b562d9630657e8f22e0424cdcc75d39b2
Signed-off-by: jbouthillie <lmcbout@gmail.com>
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
index 3b3a544..3e2026f 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/commands/handlers/NewChildElementHandler.java
@@ -26,6 +26,8 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
+import org.eclipse.jface.action.ContributionItem;
+import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.viewers.AbstractTreeViewer;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.mylyn.reviews.frame.core.model.ReviewComponent;
@@ -41,7 +43,6 @@
import org.eclipse.swt.widgets.MenuItem;
import org.eclipse.swt.widgets.ToolItem;
import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.menus.CommandContributionItem;
/**
* @author Sebastien Dubois
@@ -182,10 +183,11 @@
if (triggerObject instanceof MenuItem) {
Object data = ((MenuItem) triggerObject).getData();
- if (data != null && data instanceof CommandContributionItem) {
- CommandContributionItem contribItem = (CommandContributionItem) data;
- R4EUIPlugin.Ftracer.traceInfo("Menu command selected: " + contribItem.getData().label);
- if (contribItem.getData().label.equals(R4EUIConstants.NEW_REVIEW_GROUP_LABEL)) {
+ if (data != null && data instanceof ContributionItem) {
+ ContributionItem contribItem = (ContributionItem) data;
+ R4EUIPlugin.Ftracer.traceInfo("Menu command selected: " + contribItem.getId());
+ IContributionItem[] items = contribItem.getParent().getItems();
+ if (contribItem.getId().endsWith(R4EUIConstants.NEW_CHILD_ELEMENT_COMMAND)) {
R4EUIPlugin.Ftracer.traceInfo("Menu command selected Group, return the root");
//Add element to the root of the tree
return R4EUIModelController.getRootElement();
@@ -193,7 +195,7 @@
}
}
-
+ R4EUIPlugin.Ftracer.traceInfo("getParentElement(): look for selection");
final IStructuredSelection selection = (IStructuredSelection) R4EUIModelController.getNavigatorView()
.getTreeViewer()
.getSelection();
@@ -203,6 +205,8 @@
//Add element to the root of the tree
element = R4EUIModelController.getRootElement();
}
+ R4EUIPlugin.Ftracer.traceInfo("getParentElement(): return element: " + element.getName());
+
return element;
}
}
diff --git a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIConstants.java b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIConstants.java
index 89765f6..99c23a5 100644
--- a/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIConstants.java
+++ b/org.eclipse.mylyn.reviews.r4e.ui/src/org/eclipse/mylyn/reviews/r4e/ui/internal/utils/R4EUIConstants.java
@@ -1597,11 +1597,6 @@
public static final String NEW_REVIEW_GROUP_COMMAND_TOOLTIP = "Add a New Review Group Element";
/**
- * Field NEW_REVIEW_GROUP_LABEL. (value is ""New Review Group"")
- */
- public static final String NEW_REVIEW_GROUP_LABEL = "New Review Group";
-
- /**
* Field NEW_CHILD_ELEMENT_COMMAND_MNEMONIC. (value is ""A"")
*/
public static final String NEW_CHILD_ELEMENT_COMMAND_MNEMONIC = "A";
