Skip to content

Commit 9fd31bf

Browse files
author
mgricken
committed
Fixes bug 3377715: Debugger not active
Method to get debugger adapter in JDKDescriptor was misspelled. M drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java M drjava/src/edu/rice/cs/drjava/model/JDKDescriptor.java M drjava/src/edu/rice/cs/drjava/model/JDKToolsLibrary.java M drjava/src/edu/rice/cs/drjava/ui/MainFrame.java git-svn-id: file:///tmp/test-svn/trunk@5434 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent eedaccc commit 9fd31bf

File tree

4 files changed

+20
-7
lines changed

4 files changed

+20
-7
lines changed

‎drjava/src/edu/rice/cs/drjava/model/JDKDescriptor.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ public String getDescription(JavaVersion.FullVersion version) {
148148
return getName() + " library " + version.versionString();
149149
}
150150

151+
public String toString() {
152+
return this.getClass().getName()+": "+getName();
153+
}
154+
151155
/** Singleton representing a JDK that doesn't have a descriptor. */
152156
public static final JDKDescriptor NONE = new None();
153157

@@ -176,8 +180,8 @@ public String getAdapterForCompiler(JavaVersion.FullVersion guessedVersion) {
176180
return JDKToolsLibrary.adapterForCompiler(guessedVersion);
177181
}
178182
public String getAdapterForDebugger() { return ""; }
179-
public String adapterForDebugger(JavaVersion.FullVersion guessedVersion) {
180-
return JDKToolsLibrary.adapterForCompiler(guessedVersion);
183+
public String getAdapterForDebugger(JavaVersion.FullVersion guessedVersion) {
184+
return JDKToolsLibrary.adapterForDebugger(guessedVersion);
181185
}
182186
public boolean containsCompiler(File f) { return true; }
183187
public JavaVersion getMinimumMajorVersion() { return JavaVersion.JAVA_1_1; }

‎drjava/src/edu/rice/cs/drjava/model/JDKToolsLibrary.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ protected static CompilerInterface getCompilerInterface(String className, FullVe
125125
List<File> bootClassPath = null;
126126
String bootProp = System.getProperty("sun.boot.class.path");
127127
if (bootProp != null) { bootClassPath = CollectUtil.makeList(IOUtil.parsePath(bootProp)); }
128+
File toolsJar = edu.rice.cs.drjava.DrJava.getConfig().getSetting(edu.rice.cs.drjava.config.OptionConstants.JAVAC_LOCATION);
128129
try {
129130
Class<?>[] sig = { FullVersion.class, String.class, List.class };
130131
Object[] args = { version, "the runtime class path", bootClassPath };
@@ -153,11 +154,13 @@ public static Iterable<JDKToolsLibrary> makeFromRuntime(GlobalModel model) {
153154
String debuggerAdapter = adapterForDebugger(version);
154155
if (debuggerAdapter != null) {
155156
try {
157+
msg(" loading debugger: "+debuggerAdapter);
156158
Debugger attempt = (Debugger) ReflectUtil.loadObject(debuggerAdapter, new Class<?>[]{GlobalModel.class}, model);
159+
msg(" debugger="+attempt.getClass().getName());
157160
if (attempt.isAvailable()) { debugger = attempt; }
158161
}
159-
catch (ReflectException e) { /* can't load */ }
160-
catch (LinkageError e) { /* can't load */ }
162+
catch (ReflectException e) { msg(" no debugger, ReflectException "+e); /* can't load */ }
163+
catch (LinkageError e) { msg(" no debugger, LinkageError "+e); /* can't load */ }
161164
}
162165

163166
JavadocModel javadoc = new NoJavadocAvailable(model);

‎drjava/src/edu/rice/cs/drjava/model/JarJDKToolsLibrary.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,14 +229,20 @@ else if (f.getName().equals("tools.jar")) {
229229
String debuggerPackage = "edu.rice.cs.drjava.model.debug.jpda";
230230
if (debuggerAdapter != null) {
231231
try {
232+
JDKToolsLibrary.msg(" loading debugger: "+debuggerAdapter);
232233
Class<?>[] sig = { GlobalModel.class };
233234
// can't use loadLibraryAdapter because we need to preempt the whole package
234235
ClassLoader debugLoader = new PreemptingClassLoader(new PathClassLoader(loader, path), debuggerPackage);
235236
Debugger attempt = (Debugger) ReflectUtil.loadObject(debugLoader, debuggerAdapter, sig, model);
237+
JDKToolsLibrary.msg(" debugger="+attempt.getClass().getName());
236238
if (attempt.isAvailable()) { debugger = attempt; }
237239
}
238-
catch (ReflectException e) { /* can't load */ }
239-
catch (LinkageError e) { /* can't load */ }
240+
catch (ReflectException e) {
241+
JDKToolsLibrary.msg(" no debugger, ReflectException "+e); /* can't load */
242+
}
243+
catch (LinkageError e) {
244+
JDKToolsLibrary.msg(" no debugger, LinkageError "+e); /* can't load */
245+
}
240246
}
241247

242248
try {

‎drjava/src/edu/rice/cs/drjava/ui/MainFrame.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119

120120
/** DrJava's main window. */
121121
public class MainFrame extends SwingFrame implements ClipboardOwner, DropTargetListener {
122-
private final static edu.rice.cs.util.Log _log = new edu.rice.cs.util.Log("MainFrame.txt", false);
122+
private static final edu.rice.cs.util.Log _log = new edu.rice.cs.util.Log("MainFrame.txt", false);
123123

124124
private static final int INTERACTIONS_TAB = 0;
125125
private static final int CONSOLE_TAB = 1;

0 commit comments

Comments
 (0)