Bug 576669 - ItemType labels in ToolItemEditor not externalized
Change-Id: I29ded6f15383d479da9992a3bf99f9370b6056e0
Signed-off-by: Kit Lo <kitlo@us.ibm.com>
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ui.tools/+/186635
Tested-by: Niraj Modi <niraj.modi@in.ibm.com>
Reviewed-by: Niraj Modi <niraj.modi@in.ibm.com>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
index 0325489..b2b9a04 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.java
@@ -820,6 +820,10 @@
public String CompositePartEditor_SelectedElement;
public String CompositePartEditor_Controls;
+ public String ItemType_Push;
+ public String ItemType_Check;
+ public String ItemType_Radio;
+
public String SideValue_Bottom;
public String SideValue_Left;
public String SideValue_Right;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
index efbd257..e47aac7 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/Messages.properties
@@ -828,6 +828,10 @@
CompositePartEditor_SelectedElement=&Selected Element\:
CompositePartEditor_Controls=&Controls\:
+ItemType_Push=Push
+ItemType_Check=Check
+ItemType_Radio=Radio
+
SideValue_Bottom=Bottom
SideValue_Left=Left
SideValue_Right=Right
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
index c4ee6e4..f05e0bc 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/MenuItemEditor.java
@@ -189,6 +189,17 @@
final ComboViewer viewer = new ComboViewer(parent);
viewer.setContentProvider(ArrayContentProvider.getInstance());
+ viewer.setLabelProvider(new LabelProvider() {
+ @Override
+ public String getText(Object element) {
+ if ((ItemType) element == ItemType.CHECK) {
+ return Messages.ItemType_Check;
+ } else if ((ItemType) element == ItemType.PUSH) {
+ return Messages.ItemType_Push;
+ }
+ return Messages.ItemType_Radio;
+ }
+ });
viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
final GridData gd = new GridData();
gd.horizontalSpan = 2;
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
index 9963d96..7e843e2 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/ToolItemEditor.java
@@ -196,6 +196,17 @@
final ComboViewer viewer = new ComboViewer(parent);
viewer.setContentProvider(ArrayContentProvider.getInstance());
+ viewer.setLabelProvider(new LabelProvider() {
+ @Override
+ public String getText(Object element) {
+ if ((ItemType) element == ItemType.CHECK) {
+ return Messages.ItemType_Check;
+ } else if ((ItemType) element == ItemType.PUSH) {
+ return Messages.ItemType_Push;
+ }
+ return Messages.ItemType_Radio;
+ }
+ });
viewer.setInput(new ItemType[] { ItemType.CHECK, ItemType.PUSH, ItemType.RADIO });
final GridData gd = new GridData();
gd.horizontalSpan = 2;
