Bug 578450 - Do not show 'set object label' for nulls and primitive values

Change-Id: If3664198151687dcf71a602c5035b0bfc9ee4c81
Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.debug/+/190176
Tested-by: Sarika Sinha <[email protected]>
Reviewed-by: Sarika Sinha <[email protected]>

Author: gzsombor

org.eclipse.jdt.debug.ui/plugin.xml

@@ -935,6 +935,16 @@
                </objectState>
             </not>
          </visibility>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.jdt.debug.core.IJavaVariable"
+            id="org.eclipse.jdt.debug.ui.JavaVariableActions">
+         <visibility>
+           <objectState
+                 name="JavaVariableFilter"
+                 value="isNonNullObjectValue">
+           </objectState>
+         </visibility>
          <action
                class="org.eclipse.jdt.internal.debug.ui.actions.SetObjectLabelAction"
                enablesFor="1"

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVarActionFilter.java

@@ -196,6 +196,10 @@ else if (value.equals("isValuePrimitive")) { //$NON-NLS-1$
 					if (value.equals("isObjectValue")) { //$NON-NLS-1$
 						return varValue != null && JDIObjectValue.class.isAssignableFrom(varValue.getClass());
 					}
+					if (value.equals("isNonNullObjectValue")) { //$NON-NLS-1$
+						return varValue != null && JDIObjectValue.class.isAssignableFrom(varValue.getClass())
+								&& !((JDIObjectValue) varValue).isNull();
+					}
 					if (value.equals("isFieldVariable")) { //$NON-NLS-1$
 						return var instanceof IJavaFieldVariable;
 					}
@@ -259,4 +263,4 @@ else if (name.equals("DetailFormatterFilter")) { //$NON-NLS-1$
 	protected boolean isInstanceRetrievalAvailable(IJavaVariable var) {
 		return ((IJavaDebugTarget)var.getDebugTarget()).supportsInstanceRetrieval() && !(var instanceof JDIReferenceListVariable);
 	}
-}
+}

org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/SetObjectLabelAction.java

@@ -58,7 +58,9 @@ public void run(IAction action) {
 			}
 			if (value instanceof IJavaObject) {
 				final IJavaObject javaValue = (IJavaObject) value;
-				askForLabel(javaValue, name);
+				if (!javaValue.isNull()) {
+					askForLabel(javaValue, name);
+				}
 			}
 		} catch (DebugException e) {
 			return;