message warning issue : bug 531710 comment 8 dynamic constant

viva64 · Jun 4, 2018 · 08a3e16 · 08a3e16
1 parent 867c2e5
commit 08a3e16
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DefaultBytecodeVisitor.java b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/DefaultBytecodeVisitor.java
@@ -2123,13 +2123,17 @@ private StringBuffer appendConstantMethodHandle(StringBuffer s, String messageKi
 			}));
 	}
 	private StringBuffer appendConstantDynamic(StringBuffer s, String messageKind, int opcode,
-			int index, IConstantPoolEntry constantPoolEntry) {
+			int index, IConstantPoolEntry entry) {
 		return s.append(Messages.bind(messageKind, new String[] {
 				OpcodeStringValues.BYTECODE_NAMES[opcode],
 				Integer.toString(index),
-				Integer.toString(((IConstantPoolEntry2) constantPoolEntry).getBootstrapMethodAttributeIndex()),
-				new String(constantPoolEntry.getMethodName()),
-				new String(constantPoolEntry.getMethodDescriptor())
+				Integer.toString(((IConstantPoolEntry2) entry).getBootstrapMethodAttributeIndex()),
+				Util.toString(
+						null,
+						entry.getMethodName(),
+						entry.getMethodDescriptor(),
+						true,
+						isCompact())
 			}));
 	}
 	/**

diff --git a/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties b/org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/messages.properties
@@ -416,6 +416,7 @@ classformat_checkcast = {0} {2} [{1}]
 classformat_instanceof = {0} {2} [{1}]
 classformat_ldc_w_methodtype = {0} <MethodType {2}> [{1}]
 classformat_ldc_w_methodhandle = {0} <MethodHandle {2} {3}> [{1}]
+classformat_ldc_w_dynamic = {0} {2} {3} [{1}]
 classformat_ldc_w_class = {0} <Class {2}> [{1}]
 classformat_ldc_w_float = {0} <Float {2}> [{1}]
 classformat_ldc_w_integer = {0} <Integer {2}> [{1}]