Use getDetailFormatterFromArray() for all java versions (eclipse-jdt#677)

* Use getDetailFormatterFromArray() for all java versions

* Version bump(s) for 4.37 stream

---------

Co-authored-by: Eclipse JDT Bot <[email protected]>

Author: SougandhS

org.eclipse.jdt.debug.ui/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jdt.debug.ui; singleton:=true
-Bundle-Version: 3.15.0.qualifier
+Bundle-Version: 3.15.100.qualifier
 Bundle-Activator: org.eclipse.jdt.internal.debug.ui.JDIDebugUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin

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

@@ -18,7 +18,7 @@
   </parent>
   <groupId>org.eclipse.jdt</groupId>
   <artifactId>org.eclipse.jdt.debug.ui</artifactId>
-  <version>3.15.0-SNAPSHOT</version>
+  <version>3.15.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <properties>
   	<defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>

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

@@ -33,8 +33,6 @@
 import org.eclipse.debug.ui.IValueDetailListener;
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.Signature;
 import org.eclipse.jdt.debug.core.IEvaluationRunnable;
 import org.eclipse.jdt.debug.core.IJavaArray;
 import org.eclipse.jdt.debug.core.IJavaArrayType;
@@ -43,7 +41,6 @@
 import org.eclipse.jdt.debug.core.IJavaInterfaceType;
 import org.eclipse.jdt.debug.core.IJavaObject;
 import org.eclipse.jdt.debug.core.IJavaPrimitiveValue;
-import org.eclipse.jdt.debug.core.IJavaReferenceType;
 import org.eclipse.jdt.debug.core.IJavaStackFrame;
 import org.eclipse.jdt.debug.core.IJavaThread;
 import org.eclipse.jdt.debug.core.IJavaType;
@@ -457,12 +454,8 @@ private Expression getCompiledExpression(IJavaObject javaObject, IJavaDebugTarge
 		if (type instanceof IJavaClassType) {
 			snippet = getDetailFormatter((IJavaClassType) type);
 		}
-		if (type instanceof IJavaArrayType jArray) {
-			if (JavaCore.compareJavaVersions(debugTarget.getVersion(), JavaCore.VERSION_9) < 0) {
-				snippet = getArraySnippet((IJavaArray) javaObject);
-			} else {
-				snippet = getDetailFormatterFromArray(jArray);
-			}
+		if (type instanceof IJavaArrayType javaArray) {
+			snippet = getDetailFormatterFromArray(javaArray);
 		}
 		if (snippet != null) {
 			IJavaProject project = getJavaProject(javaObject, thread);
@@ -510,10 +503,8 @@ private Expression getCompiledExpression(IJavaPrimitiveValue javaPM, IJavaDebugT
 			}
 			snippet = primitiveSnippets(snippet, jdiType.getName(), javaPM);
 		}
-		if (type instanceof IJavaArrayType) {
-			if (JavaCore.compareJavaVersions(debugTarget.getVersion(), JavaCore.VERSION_9) < 0) {
-				snippet = getArraySnippet((IJavaArray) javaPM);
-			}
+		if (type instanceof IJavaArrayType javaArray) {
+			snippet = getDetailFormatterFromArray(javaArray);
 		}
 		if (snippet != null) {
 			IJavaProject project = getJavaProject(javaPM, thread);
@@ -576,39 +567,6 @@ private String primitiveSnippets(String snippet, String typeName, IJavaPrimitive
 
 	}
 
-	protected String getArraySnippet(IJavaArray value) throws DebugException {
-		String signature = value.getSignature();
-		int nesting = Signature.getArrayCount(signature);
-		if (nesting > 1) {
-			// for nested primitive arrays, print everything
-			String sig = Signature.getElementType(signature);
-			if (sig.length() == 1 || "Ljava/lang/String;".equals(sig)) { //$NON-NLS-1$
-				// return null so we get to "valueToString(IJavaValue)" for primitive and string types
-				return null;
-			}
-		}
-		if (((IJavaArrayType)value.getJavaType()).getComponentType() instanceof IJavaReferenceType) {
-			int length = value.getLength();
-			// guestimate at max entries to print based on char/space/comma per entry
-			int maxLength = getMaxDetailLength();
-			if (maxLength > 0){
-				int maxEntries = (maxLength / 3) + 1;
-				if (length > maxEntries) {
-					StringBuilder snippet = new StringBuilder();
-					snippet.append("Object[] shorter = new Object["); //$NON-NLS-1$
-					snippet.append(maxEntries);
-					snippet.append("]; System.arraycopy(this, 0, shorter, 0, "); //$NON-NLS-1$
-					snippet.append(maxEntries);
-					snippet.append("); "); //$NON-NLS-1$
-					snippet.append("return java.util.Arrays.asList(shorter).toString();"); //$NON-NLS-1$
-					return snippet.toString();
-				}
-			}
-			return "java.util.Arrays.asList(this).toString()"; //$NON-NLS-1$
-		}
-		return null;
-	}
-
 	/**
 	 * @see org.eclipse.jface.util.IPropertyChangeListener#propertyChange(PropertyChangeEvent)
 	 */