36942 - [plan item] Present logical view of Java objects in debugger
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
index efd944f..7867add 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/DebugUIMessages.properties
@@ -198,4 +198,6 @@
JavaDebugOptionsManager.Breakpoint___1=Breakpoint:
JavaDebugOptionsManager.Method_breakpoint___2=Method breakpoint:
JavaDebugOptionsManager.Watchpoint___3=Watchpoint:
-JavaDebugOptionsManager.Line_breakpoint___4=Line breakpoint:
\ No newline at end of file
+JavaDebugOptionsManager.Line_breakpoint___4=Line breakpoint:
+JavaVariablesContentProvider.4=Class
+JavaVariablesContentProvider.5=\ is not an instance of org.eclipse.debug.ui.IJavaVariablesContentProvider
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilCollectionVariablesContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilCollectionVariablesContentProvider.java
index ec2ba53..6dc0647 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilCollectionVariablesContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilCollectionVariablesContentProvider.java
@@ -26,8 +26,8 @@
*/
public class JavaUtilCollectionVariablesContentProvider extends AbstractJavaVariablesContentProvider {
- private static final String TO_ARRAY_METHOD_SELECTOR = "toArray";
- private static final String TO_ARRAY_METHOD_SIGNATURE = "()[Ljava/lang/Object;";
+ private static final String TO_ARRAY_METHOD_SELECTOR = "toArray"; //$NON-NLS-1$
+ private static final String TO_ARRAY_METHOD_SIGNATURE = "()[Ljava/lang/Object;"; //$NON-NLS-1$
private static final IJavaValue[] EMPTY_VALUE_ARRAY = new IJavaValue[0];
public IJavaVariable[] getVariableChildren(IDebugView view, IJavaVariable parent) throws DebugException {
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilMapEntryVariablesContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilMapEntryVariablesContentProvider.java
index 40b2984..dfc11da 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilMapEntryVariablesContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilMapEntryVariablesContentProvider.java
@@ -20,10 +20,10 @@
public class JavaUtilMapEntryVariablesContentProvider extends AbstractJavaVariablesContentProvider {
- private static final String GET_KEY_METHOD_SELECTOR = "getKey";
+ private static final String GET_KEY_METHOD_SELECTOR = "getKey"; //$NON-NLS-1$
- private static final String GET_VALUE_METHOD_SELECTOR = "getValue";
- private static final String GET_METHOD_SIGNATURE = "()Ljava/lang/Object;";
+ private static final String GET_VALUE_METHOD_SELECTOR = "getValue"; //$NON-NLS-1$
+ private static final String GET_METHOD_SIGNATURE = "()Ljava/lang/Object;"; //$NON-NLS-1$
private static final IJavaValue[] EMPTY_VALUE_ARRAY = new IJavaValue[0];
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilMapVariablesContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilMapVariablesContentProvider.java
index 988b3f1..e47ee04 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilMapVariablesContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaUtilMapVariablesContentProvider.java
@@ -26,11 +26,11 @@
*/
public class JavaUtilMapVariablesContentProvider extends AbstractJavaVariablesContentProvider {
- private static final String ENTRY_SET_METHOD_SELECTOR = "entrySet";
- private static final String ENTRY_SET_METHOD_SIGNATURE = "()Ljava/util/Set;";
+ private static final String ENTRY_SET_METHOD_SELECTOR = "entrySet"; //$NON-NLS-1$
+ private static final String ENTRY_SET_METHOD_SIGNATURE = "()Ljava/util/Set;"; //$NON-NLS-1$
- private static final String TO_ARRAY_METHOD_SELECTOR = "toArray";
- private static final String TO_ARRAY_METHOD_SIGNATURE = "()[Ljava/lang/Object;";
+ private static final String TO_ARRAY_METHOD_SELECTOR = "toArray"; //$NON-NLS-1$
+ private static final String TO_ARRAY_METHOD_SIGNATURE = "()[Ljava/lang/Object;"; //$NON-NLS-1$
private static final IJavaValue[] EMPTY_VALUE_ARRAY = new IJavaValue[0];
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVariablesContentProvider.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVariablesContentProvider.java
index d589a45..e620514 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVariablesContentProvider.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/JavaVariablesContentProvider.java
@@ -171,13 +171,14 @@
if (contentProvider == null) {
Object executable = null;
try {
- executable = JDIDebugUIPlugin.createExtension(configElement, "class");
+ executable = JDIDebugUIPlugin.createExtension(configElement, "class"); //$NON-NLS-1$
} catch (CoreException ce) {
JDIDebugUIPlugin.log(ce);
return null;
}
if (!(executable instanceof IJavaVariablesContentProvider)) {
- JDIDebugUIPlugin.logErrorMessage("Class " + configElement.getAttribute("class") + " is not an instance of org.eclipse.debug.ui.IJavaVariablesContentProvider");
+ String classAttribute = configElement.getAttribute("class"); //$NON-NLS-1$
+ JDIDebugUIPlugin.logErrorMessage(DebugUIMessages.getString("JavaVariablesContentProvider.4") + classAttribute + DebugUIMessages.getString("JavaVariablesContentProvider.5")); //$NON-NLS-1$ //$NON-NLS-2$
return null;
}
contentProvider = (IJavaVariablesContentProvider) executable;