Bug 567761 - Model Editor sometimes shows blank labelsY20201025-1200Y20201024-1200Y20201023-1200Y20201021-1200Y20201020-1200Y20201019-1200Y20201018-1200Y20201017-1200Y20201016-1200Y20201015-1200Y20201014-1200Y20201013-1200Y20201012-1200Y20201011-1200Y20201010-1200I20201025-1800I20201025-0040I20201024-1800I20201023-1800I20201023-0250I20201021-1800I20201021-0200I20201020-1800I20201020-0240I20201019-1800I20201018-1800I20201017-1800I20201016-1800I20201016-0000I20201015-1800I20201014-1800I20201013-1800I20201012-1800I20201012-0750I20201011-1800I20201010-1800

Fixed

Change-Id: I94b28d37960b2f2e30592656838a98febb270601
Signed-off-by: Wim Jongman <wim.jongman@remainsoftware.com>

4 files changed, 9 insertions, 6 deletions

diff --git a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
index 24e12122..32809015 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.tools.emf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.e4.tools.emf.ui;singleton:=true
-Bundle-Version: 4.6.900.qualifier
+Bundle-Version: 4.6.1000.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
index 9df33dc0..6fc82877 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
+++ b/bundles/org.eclipse.e4.tools.emf.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>eclipse.platform.ui.tools</groupId>
   <artifactId>org.eclipse.e4.tools.emf.ui</artifactId>
-  <version>4.6.900-SNAPSHOT</version>
+  <version>4.6.1000-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
index 4ebeda8e..caf06d1c 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/CommandEditor.java
@@ -245,7 +245,7 @@ public class CommandEditor extends AbstractComponentEditor<MCommand> {
 		if (cmd.getCommandName() != null && cmd.getCommandName().trim().length() > 0) {
 			return translate(cmd.getCommandName());
 		}
-		return null;
+		return cmd.getElementId();
 	}
 
 	@Override
diff --git a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
index b630ff5c..5b83a4bd 100644
--- a/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
+++ b/bundles/org.eclipse.e4.tools.emf.ui/src/org/eclipse/e4/tools/emf/ui/internal/common/component/HandlerEditor.java
@@ -16,6 +16,8 @@
  ******************************************************************************/
 package org.eclipse.e4.tools.emf.ui.internal.common.component;
 
+import java.text.MessageFormat;
+
 import javax.inject.Inject;
 
 import org.eclipse.core.databinding.UpdateValueStrategy;
@@ -222,10 +224,11 @@ public class HandlerEditor extends AbstractComponentEditor<MHandler> {
 	public String getDetailLabel(Object element) {
 		final MHandler handler = (MHandler) element;
 		if (handler.getCommand() != null && handler.getCommand().getCommandName() != null && handler.getCommand().getCommandName().trim().length() > 0) {
-			return handler.getCommand().getCommandName();
+			return MessageFormat.format("{0} -> {1}", handler.getElementId(), //$NON-NLS-1$
+					translate(handler.getCommand().getCommandName()));
 		}
-
-		return null;
+		return MessageFormat.format("{0} -> {1}", handler.getElementId(), //$NON-NLS-1$
+				(handler.getCommand() != null ? handler.getCommand().getElementId() : handler.getCommand()));
 	}
 
 	@Override