--- a/jdk/make/java/nio/mapfile-linux Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/make/java/nio/mapfile-linux Wed Apr 27 20:24:30 2011 +0100
@@ -44,7 +44,6 @@
Java_sun_nio_ch_EPollArrayWrapper_interrupt;
Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
Java_sun_nio_ch_EPollArrayWrapper_sizeofEPollEvent;
- Java_sun_nio_ch_EPoll_init;
Java_sun_nio_ch_EPoll_eventSize;
Java_sun_nio_ch_EPoll_eventsOffset;
Java_sun_nio_ch_EPoll_dataOffset;
@@ -129,7 +128,6 @@
Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
- Java_sun_nio_fs_LinuxWatchService_init;
Java_sun_nio_fs_LinuxWatchService_eventSize;
Java_sun_nio_fs_LinuxWatchService_eventOffsets;
Java_sun_nio_fs_LinuxWatchService_inotifyInit;
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AccessWatchpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
public class AccessWatchpointSpec extends WatchpointSpec {
@@ -38,6 +37,7 @@
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) throws InvalidTypeException,
NoSuchFieldException {
if (!(refType instanceof ClassType)) {
@@ -51,6 +51,7 @@
.createAccessWatchpointRequest(field));
}
+ @Override
public boolean equals(Object obj) {
return (obj instanceof AccessWatchpointSpec) && super.equals(obj);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/AmbiguousMethodException.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,6 +27,9 @@
public class AmbiguousMethodException extends Exception
{
+
+ private static final long serialVersionUID = 7793370943251707514L;
+
public AmbiguousMethodException()
{
super();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/BreakpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,30 +25,33 @@
package com.sun.tools.example.debug.bdi;
-import com.sun.jdi.request.*;
-
public abstract class BreakpointSpec extends EventRequestSpec {
BreakpointSpec(EventRequestSpecList specs, ReferenceTypeSpec refSpec) {
super(specs, refSpec);
}
+ @Override
void notifySet(SpecListener listener, SpecEvent evt) {
listener.breakpointSet(evt);
}
+ @Override
void notifyDeferred(SpecListener listener, SpecEvent evt) {
listener.breakpointDeferred(evt);
}
+ @Override
void notifyResolved(SpecListener listener, SpecEvent evt) {
listener.breakpointResolved(evt);
}
+ @Override
void notifyDeleted(SpecListener listener, SpecEvent evt) {
listener.breakpointDeleted(evt);
}
+ @Override
void notifyError(SpecListener listener, SpecErrorEvent evt) {
listener.breakpointError(evt);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ChildSession.java Wed Apr 27 20:24:30 2011 +0100
@@ -43,10 +43,6 @@
private BufferedReader out;
private BufferedReader err;
- private InputWriter inputWriter;
- private OutputReader outputReader;
- private OutputReader errorReader;
-
private InputListener input;
private OutputListener output;
private OutputListener error;
@@ -84,6 +80,7 @@
this.error = error;
}
+ @Override
public boolean attach() {
if (!connectToVMProcess()) {
@@ -131,6 +128,7 @@
return true;
}
+ @Override
public void detach() {
//### debug
@@ -242,10 +240,7 @@
this.diagnostics = diagnostics;
}
- public void quit() {
- running = false;
- }
-
+ @Override
public void run() {
try {
int count;
@@ -254,6 +249,7 @@
// Run in Swing event dispatcher thread.
final String chars = new String(buffer, 0, count);
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
output.putString(chars);
}
@@ -264,6 +260,7 @@
} catch (IOException e) {
// Run in Swing event dispatcher thread.
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
diagnostics.putString("IO error reading " +
streamName +
@@ -288,11 +285,7 @@
this.input = input;
}
- public void quit() {
- //### Won't have much effect if blocked on input!
- running = false;
- }
-
+ @Override
public void run() {
String line;
while (running) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EvaluationException.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class EvaluationException extends Exception {}
+public class EvaluationException extends Exception {
+
+ private static final long serialVersionUID = 4947109680354951694L;
+}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/EventRequestSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,8 +25,6 @@
package com.sun.tools.example.debug.bdi;
-import java.util.*;
-
import com.sun.jdi.*;
import com.sun.jdi.request.EventRequest;
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExceptionSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,11 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.ReferenceType;
-import com.sun.jdi.request.*;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
public class ExceptionSpec extends EventRequestSpec {
@@ -45,22 +40,27 @@
this.notifyUncaught = notifyUncaught;
}
+ @Override
void notifySet(SpecListener listener, SpecEvent evt) {
listener.exceptionInterceptSet(evt);
}
+ @Override
void notifyDeferred(SpecListener listener, SpecEvent evt) {
listener.exceptionInterceptDeferred(evt);
}
+ @Override
void notifyResolved(SpecListener listener, SpecEvent evt) {
listener.exceptionInterceptResolved(evt);
}
+ @Override
void notifyDeleted(SpecListener listener, SpecEvent evt) {
listener.exceptionInterceptDeleted(evt);
}
+ @Override
void notifyError(SpecListener listener, SpecErrorEvent evt) {
listener.exceptionInterceptError(evt);
}
@@ -68,16 +68,19 @@
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) {
setRequest(refType.virtualMachine().eventRequestManager()
.createExceptionRequest(refType,
notifyCaught, notifyUncaught));
}
+ @Override
public int hashCode() {
return refSpec.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof ExceptionSpec) {
ExceptionSpec es = (ExceptionSpec)obj;
@@ -88,6 +91,7 @@
}
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer("exception catch ");
buffer.append(refSpec.toString());
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ExecutionManager.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.event.*;
import com.sun.jdi.request.*;
import com.sun.jdi.connect.*;
import com.sun.tools.example.debug.expr.ExpressionParser;
@@ -56,7 +55,7 @@
// Session Listeners
- Vector<SessionListener> sessionListeners = new Vector<SessionListener>();
+ ArrayList<SessionListener> sessionListeners = new ArrayList<SessionListener>();
public void addSessionListener(SessionListener listener) {
sessionListeners.add(listener);
@@ -68,7 +67,7 @@
// Spec Listeners
- Vector<SpecListener> specListeners = new Vector<SpecListener>();
+ ArrayList<SpecListener> specListeners = new ArrayList<SpecListener>();
public void addSpecListener(SpecListener cl) {
specListeners.add(cl);
@@ -80,7 +79,7 @@
// JDI Listeners
- Vector<JDIListener> jdiListeners = new Vector<JDIListener>();
+ ArrayList<JDIListener> jdiListeners = new ArrayList<JDIListener>();
/**
* Adds a JDIListener
@@ -105,50 +104,50 @@
// App Echo Listeners
- private Vector<OutputListener> appEchoListeners = new Vector<OutputListener>();
+ private ArrayList<OutputListener> appEchoListeners = new ArrayList<OutputListener>();
public void addApplicationEchoListener(OutputListener l) {
- appEchoListeners.addElement(l);
+ appEchoListeners.add(l);
}
public void removeApplicationEchoListener(OutputListener l) {
- appEchoListeners.removeElement(l);
+ appEchoListeners.remove(l);
}
// App Output Listeners
- private Vector<OutputListener> appOutputListeners = new Vector<OutputListener>();
+ private ArrayList<OutputListener> appOutputListeners = new ArrayList<OutputListener>();
public void addApplicationOutputListener(OutputListener l) {
- appOutputListeners.addElement(l);
+ appOutputListeners.add(l);
}
public void removeApplicationOutputListener(OutputListener l) {
- appOutputListeners.removeElement(l);
+ appOutputListeners.remove(l);
}
// App Error Listeners
- private Vector<OutputListener> appErrorListeners = new Vector<OutputListener>();
+ private ArrayList<OutputListener> appErrorListeners = new ArrayList<OutputListener>();
public void addApplicationErrorListener(OutputListener l) {
- appErrorListeners.addElement(l);
+ appErrorListeners.add(l);
}
public void removeApplicationErrorListener(OutputListener l) {
- appErrorListeners.removeElement(l);
+ appErrorListeners.remove(l);
}
// Diagnostic Listeners
- private Vector<OutputListener> diagnosticsListeners = new Vector<OutputListener>();
+ private ArrayList<OutputListener> diagnosticsListeners = new ArrayList<OutputListener>();
public void addDiagnosticsListener(OutputListener l) {
- diagnosticsListeners.addElement(l);
+ diagnosticsListeners.add(l);
}
public void removeDiagnosticsListener(OutputListener l) {
- diagnosticsListeners.removeElement(l);
+ diagnosticsListeners.remove(l);
}
/////////// End Listener Registration //////////////
@@ -159,7 +158,9 @@
}
void ensureActiveSession() throws NoSessionException {
- if (session == null) throw new NoSessionException();
+ if (session == null) {
+ throw new NoSessionException();
+ }
}
public EventRequestManager eventRequestManager() {
@@ -293,6 +294,7 @@
ensureActiveSession();
if (f != null) {
frameGetter = new ExpressionParser.GetFrame() {
+ @Override
public StackFrame get() /* throws IncompatibleThreadStateException */ {
return f;
}
@@ -628,35 +630,35 @@
*/
private void notifyInterrupted() {
- Vector l = (Vector)sessionListeners.clone();
+ ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners);
EventObject evt = new EventObject(this);
for (int i = 0; i < l.size(); i++) {
- ((SessionListener)l.elementAt(i)).sessionInterrupt(evt);
+ l.get(i).sessionInterrupt(evt);
}
}
private void notifyContinued() {
- Vector l = (Vector)sessionListeners.clone();
+ ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners);
EventObject evt = new EventObject(this);
for (int i = 0; i < l.size(); i++) {
- ((SessionListener)l.elementAt(i)).sessionContinue(evt);
+ l.get(i).sessionContinue(evt);
}
}
private void notifySessionStart() {
- Vector l = (Vector)sessionListeners.clone();
+ ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners);
EventObject evt = new EventObject(this);
for (int i = 0; i < l.size(); i++) {
- ((SessionListener)l.elementAt(i)).sessionStart(evt);
+ l.get(i).sessionStart(evt);
}
}
private void notifySessionDeath() {
/*** noop for now
- Vector l = (Vector)sessionListeners.clone();
+ ArrayList<SessionListener> l = new ArrayList<SessionListener>(sessionListeners);
EventObject evt = new EventObject(this);
for (int i = 0; i < l.size(); i++) {
- ((SessionListener)l.elementAt(i)).sessionDeath(evt);
+ ((SessionListener)l.get(i)).sessionDeath(evt);
}
****/
}
@@ -684,6 +686,7 @@
}
private InputListener appInput = new InputListener() {
+ @Override
public String getLine() {
// Don't allow reader to be interrupted -- catch and retry.
String line = null;
@@ -703,6 +706,7 @@
// Run in Swing event dispatcher thread.
final String input = line;
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
echoInputLine(input);
}
@@ -714,37 +718,40 @@
private static String newline = System.getProperty("line.separator");
private void echoInputLine(String line) {
- Vector l = (Vector)appEchoListeners.clone();
+ ArrayList<OutputListener> l = new ArrayList<OutputListener>(appEchoListeners);
for (int i = 0; i < l.size(); i++) {
- OutputListener ol = (OutputListener)l.elementAt(i);
+ OutputListener ol = l.get(i);
ol.putString(line);
ol.putString(newline);
}
}
private OutputListener appOutput = new OutputListener() {
+ @Override
public void putString(String string) {
- Vector l = (Vector)appOutputListeners.clone();
+ ArrayList<OutputListener> l = new ArrayList<OutputListener>(appEchoListeners);
for (int i = 0; i < l.size(); i++) {
- ((OutputListener)l.elementAt(i)).putString(string);
+ l.get(i).putString(string);
}
}
};
private OutputListener appError = new OutputListener() {
+ @Override
public void putString(String string) {
- Vector l = (Vector)appErrorListeners.clone();
+ ArrayList<OutputListener> l = new ArrayList<OutputListener>(appEchoListeners);
for (int i = 0; i < l.size(); i++) {
- ((OutputListener)l.elementAt(i)).putString(string);
+ l.get(i).putString(string);
}
}
};
private OutputListener diagnostics = new OutputListener() {
+ @Override
public void putString(String string) {
- Vector l = (Vector)diagnosticsListeners.clone();
+ ArrayList<OutputListener> l = new ArrayList<OutputListener>(diagnosticsListeners);
for (int i = 0; i < l.size(); i++) {
- ((OutputListener)l.elementAt(i)).putString(string);
+ l.get(i).putString(string);
}
}
};
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/FrameIndexOutOfBoundsException.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class FrameIndexOutOfBoundsException extends IndexOutOfBoundsException {}
+public class FrameIndexOutOfBoundsException extends IndexOutOfBoundsException {
+
+ private static final long serialVersionUID = -4870148107027371437L;
+}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/JDIEventSource.java Wed Apr 27 20:24:30 2011 +0100
@@ -28,8 +28,6 @@
import com.sun.jdi.*;
import com.sun.jdi.event.*;
-import java.util.*;
-
import com.sun.tools.example.debug.event.*;
import javax.swing.SwingUtilities;
@@ -55,6 +53,7 @@
this.queue = session.vm.eventQueue();
}
+ @Override
public void run() {
try {
runLoop();
@@ -78,6 +77,7 @@
//### Gross foul hackery!
private void dispatchEventSet(final AbstractEventSet es) {
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
boolean interrupted = es.suspendedAll();
es.notify(firstListener);
@@ -117,54 +117,65 @@
//### This is a Hack, deal with it
private class FirstListener implements JDIListener {
+ @Override
public void accessWatchpoint(AccessWatchpointEventSet e) {
session.runtime.validateThreadInfo();
wantInterrupt = true;
}
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
wantInterrupt = false;
runtime.resolve(e.getReferenceType());
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
wantInterrupt = false;
}
+ @Override
public void exception(ExceptionEventSet e) {
wantInterrupt = true;
}
+ @Override
public void locationTrigger(LocationTriggerEventSet e) {
session.runtime.validateThreadInfo();
wantInterrupt = true;
}
+ @Override
public void modificationWatchpoint(ModificationWatchpointEventSet e) {
session.runtime.validateThreadInfo();
wantInterrupt = true;
}
+ @Override
public void threadDeath(ThreadDeathEventSet e) {
wantInterrupt = false;
}
+ @Override
public void threadStart(ThreadStartEventSet e) {
wantInterrupt = false;
}
+ @Override
public void vmDeath(VMDeathEventSet e) {
//### Should have some way to notify user
//### that VM died before the session ended.
wantInterrupt = false;
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
//### Notify user?
wantInterrupt = false;
session.runtime.endSession();
}
+ @Override
public void vmStart(VMStartEventSet e) {
//### Do we need to do anything with it?
wantInterrupt = false;
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineBreakpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,11 +26,7 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
-
-import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
public class LineBreakpointSpec extends BreakpointSpec {
int lineNumber;
@@ -44,6 +40,7 @@
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) throws InvalidTypeException,
LineNotFoundException {
if (!(refType instanceof ClassType)) {
@@ -81,10 +78,12 @@
return lineNumber;
}
+ @Override
public int hashCode() {
return refSpec.hashCode() + lineNumber;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof LineBreakpointSpec) {
LineBreakpointSpec breakpoint = (LineBreakpointSpec)obj;
@@ -96,6 +95,7 @@
}
}
+ @Override
public String errorMessageFor(Exception e) {
if (e instanceof LineNotFoundException) {
return ("No code at line " + lineNumber() + " in " + refSpec);
@@ -107,6 +107,7 @@
}
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer("breakpoint ");
buffer.append(refSpec.toString());
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/LineNotFoundException.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,6 +27,9 @@
public class LineNotFoundException extends Exception
{
+
+ private static final long serialVersionUID = -5630418117861587582L;
+
public LineNotFoundException()
{
super();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MalformedMemberNameException.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,6 +26,9 @@
package com.sun.tools.example.debug.bdi;
class MalformedMemberNameException extends Exception {
+
+ private static final long serialVersionUID = -7726664097374844485L;
+
public MalformedMemberNameException() {
super();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodBreakpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,11 +26,8 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
-
import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
public class MethodBreakpointSpec extends BreakpointSpec {
String methodId;
@@ -47,6 +44,7 @@
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) throws MalformedMemberNameException,
AmbiguousMethodException,
InvalidTypeException,
@@ -80,12 +78,14 @@
return methodArgs;
}
+ @Override
public int hashCode() {
return refSpec.hashCode() +
((methodId != null) ? methodId.hashCode() : 0) +
((methodArgs != null) ? methodArgs.hashCode() : 0);
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof MethodBreakpointSpec) {
MethodBreakpointSpec breakpoint = (MethodBreakpointSpec)obj;
@@ -98,6 +98,7 @@
}
}
+ @Override
public String errorMessageFor(Exception e) {
if (e instanceof AmbiguousMethodException) {
return ("Method " + methodName() + " is overloaded; specify arguments");
@@ -114,6 +115,7 @@
}
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer("breakpoint ");
buffer.append(refSpec.toString());
@@ -257,7 +259,7 @@
*/
if ((name.indexOf('.') == -1) || name.startsWith("*.")) {
try {
- List refs = specs.runtime.findClassesMatchingPattern(name);
+ List<?> refs = specs.runtime.findClassesMatchingPattern(name);
if (refs.size() > 0) { //### ambiguity???
name = ((ReferenceType)(refs.get(0))).name();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/MethodNotFoundException.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,6 +27,8 @@
public class MethodNotFoundException extends Exception
{
+ private static final long serialVersionUID = -2064968107599632609L;
+
public MethodNotFoundException()
{
super();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ModificationWatchpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
public class ModificationWatchpointSpec extends WatchpointSpec {
@@ -38,6 +37,7 @@
/**
* The 'refType' is known to match.
*/
+ @Override
void resolve(ReferenceType refType) throws InvalidTypeException,
NoSuchFieldException {
if (!(refType instanceof ClassType)) {
@@ -51,6 +51,7 @@
.createModificationWatchpointRequest(field));
}
+ @Override
public boolean equals(Object obj) {
return (obj instanceof ModificationWatchpointSpec) &&
super.equals(obj);
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoSessionException.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class NoSessionException extends Exception {}
+public class NoSessionException extends Exception {
+
+ private static final long serialVersionUID = -7324357828115128603L;
+}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/NoThreadException.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,4 +25,8 @@
package com.sun.tools.example.debug.bdi;
-public class NoThreadException extends Exception {}
+public class NoThreadException extends Exception {
+
+ private static final long serialVersionUID = 1846613539928921998L;
+
+}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/PatternReferenceTypeSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -47,6 +47,7 @@
/**
* Does the specified ReferenceType match this spec.
*/
+ @Override
public boolean matches(ReferenceType refType) {
if (isWild) {
return refType.name().endsWith(classId);
@@ -55,10 +56,12 @@
}
}
+ @Override
public int hashCode() {
return classId.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof PatternReferenceTypeSpec) {
PatternReferenceTypeSpec spec = (PatternReferenceTypeSpec)obj;
@@ -89,6 +92,7 @@
}
}
+ @Override
public String toString() {
return isWild? "*" + classId : classId;
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ReferenceTypeSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -33,7 +33,9 @@
*/
boolean matches(ReferenceType refType);
+ @Override
int hashCode();
+ @Override
boolean equals(Object obj);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Session.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,7 +27,6 @@
import com.sun.jdi.VirtualMachine;
import com.sun.jdi.VMDisconnectedException;
-import com.sun.jdi.event.EventSet;
/**
* Our repository of what we know about the state of one
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SourceNameReferenceTypeSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -39,6 +39,7 @@
/**
* Does the specified ReferenceType match this spec.
*/
+ @Override
public boolean matches(ReferenceType refType) {
try {
if (refType.sourceName().equals(sourceName)) {
@@ -48,9 +49,6 @@
return true;
} catch(AbsentInformationException exc) {
} catch(ObjectCollectedException exc) {
- } catch(InvalidLineNumberException exc) {
-// } catch(ClassNotPreparedException exc) {
-// -- should not happen, so don't catch this ---
}
}
} catch(AbsentInformationException exc) {
@@ -59,10 +57,12 @@
return false;
}
+ @Override
public int hashCode() {
return sourceName.hashCode() + linenumber;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof SourceNameReferenceTypeSpec) {
SourceNameReferenceTypeSpec spec = (SourceNameReferenceTypeSpec)obj;
@@ -74,6 +74,7 @@
}
}
+ @Override
public String toString() {
return sourceName + "@" + linenumber;
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecErrorEvent.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,10 +25,9 @@
package com.sun.tools.example.debug.bdi;
-import java.util.EventObject;
-
public class SpecErrorEvent extends SpecEvent {
+ private static final long serialVersionUID = 8162634387866409578L;
private Exception reason;
public SpecErrorEvent(EventRequestSpec eventRequestSpec,
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/SpecEvent.java Wed Apr 27 20:24:30 2011 +0100
@@ -31,6 +31,7 @@
public class SpecEvent extends EventObject {
+ private static final long serialVersionUID = 4820735456787276230L;
private EventRequestSpec eventRequestSpec;
public SpecEvent(EventRequestSpec eventRequestSpec) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadGroupIterator.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.ThreadGroupReference;
-import com.sun.jdi.ThreadReference;
import java.util.List;
import java.util.Stack;
import java.util.ArrayList;
@@ -73,10 +72,12 @@
}
}
+ @Override
public boolean hasNext() {
return !stack.isEmpty();
}
+ @Override
public ThreadGroupReference next() {
return nextThreadGroup();
}
@@ -87,6 +88,7 @@
return tg;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadInfo.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,9 +26,6 @@
package com.sun.tools.example.debug.bdi;
import com.sun.jdi.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Iterator;
//### Should handle target VM death or connection failure cleanly.
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/ThreadIterator.java Wed Apr 27 20:24:30 2011 +0100
@@ -43,6 +43,7 @@
tgi = new ThreadGroupIterator(tgl);
}
+ @Override
public boolean hasNext() {
while (it == null || !it.hasNext()) {
if (!tgi.hasNext()) {
@@ -53,6 +54,7 @@
return true;
}
+ @Override
public ThreadReference next() {
return it.next();
}
@@ -61,6 +63,7 @@
return next();
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/Utils.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,9 +26,6 @@
package com.sun.tools.example.debug.bdi; //### does it belong here?
import com.sun.jdi.*;
-import com.sun.tools.jdi.*;
-import java.util.*;
-import java.io.*;
public class Utils {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMLaunchFailureException.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class VMLaunchFailureException extends Exception {}
+public class VMLaunchFailureException extends Exception {
+
+ private static final long serialVersionUID = -2439646729274310108L;
+}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/VMNotInterruptedException.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,4 +25,7 @@
package com.sun.tools.example.debug.bdi;
-public class VMNotInterruptedException extends Exception {}
+public class VMNotInterruptedException extends Exception {
+
+ private static final long serialVersionUID = 8111074582188765600L;
+}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/bdi/WatchpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,9 +25,6 @@
package com.sun.tools.example.debug.bdi;
-import com.sun.jdi.*;
-import com.sun.jdi.request.*;
-
public abstract class WatchpointSpec extends EventRequestSpec {
final String fieldId;
@@ -40,31 +37,38 @@
// }
}
+ @Override
void notifySet(SpecListener listener, SpecEvent evt) {
listener.watchpointSet(evt);
}
+ @Override
void notifyDeferred(SpecListener listener, SpecEvent evt) {
listener.watchpointDeferred(evt);
}
+ @Override
void notifyResolved(SpecListener listener, SpecEvent evt) {
listener.watchpointResolved(evt);
}
+ @Override
void notifyDeleted(SpecListener listener, SpecEvent evt) {
listener.watchpointDeleted(evt);
}
+ @Override
void notifyError(SpecListener listener, SpecErrorEvent evt) {
listener.watchpointError(evt);
}
+ @Override
public int hashCode() {
return refSpec.hashCode() + fieldId.hashCode() +
getClass().hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof WatchpointSpec) {
WatchpointSpec watchpoint = (WatchpointSpec)obj;
@@ -77,6 +81,7 @@
}
}
+ @Override
public String errorMessageFor(Exception e) {
if (e instanceof NoSuchFieldException) {
return ("No field " + fieldId + " in " + refSpec);
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/AbstractEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -33,6 +33,7 @@
public abstract class AbstractEventSet extends EventObject implements EventSet {
+ private static final long serialVersionUID = 2772717574222076977L;
private final EventSet jdiEventSet;
final Event oneEvent;
@@ -81,6 +82,7 @@
// Implement Mirror
+ @Override
public VirtualMachine virtualMachine() {
return jdiEventSet.virtualMachine();
}
@@ -105,10 +107,12 @@
return jdiEventSet.suspendPolicy();
}
+ @Override
public void resume() {
jdiEventSet.resume();
}
+ @Override
public int suspendPolicy() {
return jdiEventSet.suspendPolicy();
}
@@ -128,6 +132,7 @@
/**
* Return an iterator specific to {@link Event} objects.
*/
+ @Override
public EventIterator eventIterator() {
return jdiEventSet.eventIterator();
}
@@ -142,6 +147,7 @@
*
* @return the number of elements in this set (its cardinality).
*/
+ @Override
public int size() {
return jdiEventSet.size();
}
@@ -151,6 +157,7 @@
*
* @return <tt>true</tt> if this set contains no elements.
*/
+ @Override
public boolean isEmpty() {
return jdiEventSet.isEmpty();
}
@@ -163,6 +170,7 @@
*
* @return <tt>true</tt> if this set contains the specified element.
*/
+ @Override
public boolean contains(Object o) {
return jdiEventSet.contains(o);
}
@@ -174,6 +182,7 @@
*
* @return an iterator over the elements in this set.
*/
+ @Override
public Iterator<Event> iterator() {
return jdiEventSet.iterator();
}
@@ -184,6 +193,7 @@
*
* @return an array containing all of the elements in this set.
*/
+ @Override
public Object[] toArray() {
return jdiEventSet.toArray();
}
@@ -202,6 +212,7 @@
* @throws ArrayStoreException the runtime type of a is not a supertype
* of the runtime type of every element in this set.
*/
+ @Override
public <T> T[] toArray(T a[]) {
return jdiEventSet.toArray(a);
}
@@ -217,6 +228,7 @@
* @return <tt>true</tt> if this set contains all of the elements of the
* specified collection.
*/
+ @Override
public boolean containsAll(Collection<?> c) {
return jdiEventSet.containsAll(c);
}
@@ -224,21 +236,27 @@
// Make the rest of Set unmodifiable
+ @Override
public boolean add(Event e){
throw new UnsupportedOperationException();
}
+ @Override
public boolean remove(Object o) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean addAll(Collection<? extends Event> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean removeAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public boolean retainAll(Collection<?> coll) {
throw new UnsupportedOperationException();
}
+ @Override
public void clear() {
throw new UnsupportedOperationException();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/AccessWatchpointEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,15 +25,17 @@
package com.sun.tools.example.debug.event;
-import com.sun.jdi.*;
import com.sun.jdi.event.*;
public class AccessWatchpointEventSet extends WatchpointEventSet {
+ private static final long serialVersionUID = -2620394219156607673L;
+
AccessWatchpointEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
+ @Override
public void notify(JDIListener listener) {
listener.accessWatchpoint(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassPrepareEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,6 +30,8 @@
public class ClassPrepareEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 5958493423581010491L;
+
ClassPrepareEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -55,6 +57,7 @@
return ((ClassPrepareEvent)oneEvent).referenceType();
}
+ @Override
public void notify(JDIListener listener) {
listener.classPrepare(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ClassUnloadEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,11 +25,12 @@
package com.sun.tools.example.debug.event;
-import com.sun.jdi.*;
import com.sun.jdi.event.*;
public class ClassUnloadEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 8370341450345835866L;
+
ClassUnloadEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -48,6 +49,7 @@
return ((ClassUnloadEvent)oneEvent).classSignature();
}
+ @Override
public void notify(JDIListener listener) {
listener.classUnload(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ExceptionEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,6 +30,8 @@
public class ExceptionEventSet extends LocatableEventSet {
+ private static final long serialVersionUID = 5328140167954640711L;
+
ExceptionEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -75,6 +77,7 @@
return ((ExceptionEvent)oneEvent).catchLocation();
}
+ @Override
public void notify(JDIListener listener) {
listener.exception(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/JDIAdapter.java Wed Apr 27 20:24:30 2011 +0100
@@ -33,36 +33,47 @@
*/
public class JDIAdapter implements JDIListener {
+ @Override
public void accessWatchpoint(AccessWatchpointEventSet e) {
}
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
}
+ @Override
public void exception(ExceptionEventSet e) {
}
+ @Override
public void locationTrigger(LocationTriggerEventSet e) {
}
+ @Override
public void modificationWatchpoint(ModificationWatchpointEventSet e) {
}
+ @Override
public void threadDeath(ThreadDeathEventSet e) {
}
+ @Override
public void threadStart(ThreadStartEventSet e) {
}
+ @Override
public void vmDeath(VMDeathEventSet e) {
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
}
+ @Override
public void vmStart(VMStartEventSet e) {
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/LocatableEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -33,6 +33,8 @@
*/
public abstract class LocatableEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 1027131209997915620L;
+
LocatableEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/LocationTriggerEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,15 +25,17 @@
package com.sun.tools.example.debug.event;
-import com.sun.jdi.*;
import com.sun.jdi.event.*;
public class LocationTriggerEventSet extends LocatableEventSet {
+ private static final long serialVersionUID = -3674631710485872487L;
+
LocationTriggerEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
+ @Override
public void notify(JDIListener listener) {
listener.locationTrigger(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ModificationWatchpointEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,6 +30,8 @@
public class ModificationWatchpointEventSet extends WatchpointEventSet {
+ private static final long serialVersionUID = -680889300856154719L;
+
ModificationWatchpointEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -42,6 +44,7 @@
return ((ModificationWatchpointEvent)oneEvent).valueToBe();
}
+ @Override
public void notify(JDIListener listener) {
listener.modificationWatchpoint(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadDeathEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,6 +30,8 @@
public class ThreadDeathEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = -8801604712308151331L;
+
ThreadDeathEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -44,6 +46,7 @@
return ((ThreadDeathEvent)oneEvent).thread();
}
+ @Override
public void notify(JDIListener listener) {
listener.threadDeath(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/ThreadStartEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,6 +30,8 @@
public class ThreadStartEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = -3802096132294933502L;
+
ThreadStartEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -44,6 +46,7 @@
return ((ThreadStartEvent)oneEvent).thread();
}
+ @Override
public void notify(JDIListener listener) {
listener.threadStart(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDeathEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -29,10 +29,13 @@
public class VMDeathEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 1163097303940092229L;
+
VMDeathEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
+ @Override
public void notify(JDIListener listener) {
listener.vmDeath(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/VMDisconnectEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -29,10 +29,13 @@
public class VMDisconnectEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = 7968123152344675342L;
+
VMDisconnectEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
+ @Override
public void notify(JDIListener listener) {
listener.vmDisconnect(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/VMStartEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,6 +30,8 @@
public class VMStartEventSet extends AbstractEventSet {
+ private static final long serialVersionUID = -3384957227835478191L;
+
VMStartEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
@@ -44,6 +46,7 @@
return ((VMStartEvent)oneEvent).thread();
}
+ @Override
public void notify(JDIListener listener) {
listener.vmStart(this);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/event/WatchpointEventSet.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,6 +30,8 @@
public abstract class WatchpointEventSet extends LocatableEventSet {
+ private static final long serialVersionUID = 5606285209703845409L;
+
WatchpointEventSet(EventSet jdiEventSet) {
super(jdiEventSet);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParser.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,25 +27,25 @@
package com.sun.tools.example.debug.expr;
import com.sun.jdi.*;
+
import java.util.Stack;
import java.util.List;
import java.util.ArrayList;
-@SuppressWarnings("unchecked")
public class ExpressionParser implements ExpressionParserConstants {
- Stack stack = new Stack();
+ Stack<LValue> stack = new Stack<LValue>();
VirtualMachine vm = null;
GetFrame frameGetter = null;
private static GetFrame lastFrameGetter;
private static LValue lastLValue;
LValue peek() {
- return (LValue)stack.peek();
+ return stack.peek();
}
LValue pop() {
- return (LValue)stack.pop();
+ return stack.pop();
}
void push(LValue lval) {
@@ -61,17 +61,14 @@
}
public static Value evaluate(String expr, VirtualMachine vm,
- GetFrame frameGetter) throws ParseException,
- InvocationException,
- InvalidTypeException,
- ClassNotLoadedException,
+ GetFrame frameGetter) throws ParseException, InvocationException,
+ InvalidTypeException, ClassNotLoadedException,
IncompatibleThreadStateException {
// TODO StringBufferInputStream is deprecated.
java.io.InputStream in = new java.io.StringBufferInputStream(expr);
ExpressionParser parser = new ExpressionParser(in);
parser.vm = vm;
parser.frameGetter = frameGetter;
- Value value = null;
parser.Expression();
lastFrameGetter = frameGetter;
lastLValue = parser.pop();
@@ -89,8 +86,8 @@
try {
parser = new ExpressionParser(new java.io.FileInputStream(args[0]));
} catch (java.io.FileNotFoundException e) {
- System.out.println("Java Parser Version 1.0.2: File " +
- args[0] + " not found.");
+ System.out.println("Java Parser Version 1.0.2: File " + args[0]
+ + " not found.");
return;
}
} else {
@@ -137,8 +134,7 @@
jj_consume_token(-1);
throw new ParseException();
}
- label_1:
- while (true) {
+ label_1: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LBRACKET:
;
@@ -189,8 +185,7 @@
StringBuffer sb = new StringBuffer();
jj_consume_token(IDENTIFIER);
sb.append(token);
- label_2:
- while (true) {
+ label_2: while (true) {
if (jj_2_1(2)) {
;
} else {
@@ -198,16 +193,18 @@
}
jj_consume_token(DOT);
jj_consume_token(IDENTIFIER);
- sb.append('.'); sb.append(token);
- }
- {if (true) return sb.toString();}
+ sb.append('.');
+ sb.append(token);
+ }
+ if (true) {
+ return sb.toString();
+ }
throw new Error("Missing return statement in function");
}
final public void NameList() throws ParseException {
Name();
- label_3:
- while (true) {
+ label_3: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
@@ -261,7 +258,9 @@
PrimaryExpression();
AssignmentOperator();
Expression();
- LValue exprVal = pop(); pop().setValue(exprVal); push(exprVal);
+ LValue exprVal = pop();
+ pop().setValue(exprVal);
+ push(exprVal);
}
final public void AssignmentOperator() throws ParseException {
@@ -317,13 +316,18 @@
Expression();
jj_consume_token(COLON);
ConditionalExpression();
- LValue falseBranch = pop(); LValue trueBranch = pop();
+ LValue falseBranch = pop();
+ LValue trueBranch = pop();
Value cond = pop().interiorGetValue();
if (cond instanceof BooleanValue) {
- push(((BooleanValue)cond).booleanValue()?
- trueBranch : falseBranch);
+ push(((BooleanValue) cond).booleanValue() ? trueBranch
+ : falseBranch);
} else {
- {if (true) throw new ParseException("Condition must be boolean");}
+ {
+ if (true) {
+ throw new ParseException("Condition must be boolean");
+ }
+ }
}
break;
default:
@@ -334,8 +338,7 @@
final public void ConditionalOrExpression() throws ParseException {
ConditionalAndExpression();
- label_4:
- while (true) {
+ label_4: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SC_OR:
;
@@ -346,14 +349,17 @@
}
jj_consume_token(SC_OR);
ConditionalAndExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void ConditionalAndExpression() throws ParseException {
InclusiveOrExpression();
- label_5:
- while (true) {
+ label_5: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case SC_AND:
;
@@ -364,14 +370,17 @@
}
jj_consume_token(SC_AND);
InclusiveOrExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void InclusiveOrExpression() throws ParseException {
ExclusiveOrExpression();
- label_6:
- while (true) {
+ label_6: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BIT_OR:
;
@@ -382,14 +391,17 @@
}
jj_consume_token(BIT_OR);
ExclusiveOrExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void ExclusiveOrExpression() throws ParseException {
AndExpression();
- label_7:
- while (true) {
+ label_7: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case XOR:
;
@@ -400,14 +412,17 @@
}
jj_consume_token(XOR);
AndExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void AndExpression() throws ParseException {
EqualityExpression();
- label_8:
- while (true) {
+ label_8: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case BIT_AND:
;
@@ -418,15 +433,18 @@
}
jj_consume_token(BIT_AND);
EqualityExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void EqualityExpression() throws ParseException {
Token tok;
InstanceOfExpression();
- label_9:
- while (true) {
+ label_9: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EQ:
case NE:
@@ -460,7 +478,11 @@
case INSTANCEOF:
jj_consume_token(INSTANCEOF);
Type();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
default:
jj_la1[14] = jj_gen;
@@ -471,8 +493,7 @@
final public void RelationalExpression() throws ParseException {
Token tok;
ShiftExpression();
- label_10:
- while (true) {
+ label_10: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case GT:
case LT:
@@ -510,8 +531,7 @@
final public void ShiftExpression() throws ParseException {
AdditiveExpression();
- label_11:
- while (true) {
+ label_11: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LSHIFT:
case RSIGNEDSHIFT:
@@ -538,15 +558,18 @@
throw new ParseException();
}
AdditiveExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
}
final public void AdditiveExpression() throws ParseException {
Token tok;
MultiplicativeExpression();
- label_12:
- while (true) {
+ label_12: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case PLUS:
case MINUS:
@@ -577,8 +600,7 @@
final public void MultiplicativeExpression() throws ParseException {
Token tok;
UnaryExpression();
- label_13:
- while (true) {
+ label_13: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case STAR:
case SLASH:
@@ -627,7 +649,11 @@
throw new ParseException();
}
UnaryExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
case INCR:
PreIncrementExpression();
@@ -661,13 +687,21 @@
final public void PreIncrementExpression() throws ParseException {
jj_consume_token(INCR);
PrimaryExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
final public void PreDecrementExpression() throws ParseException {
jj_consume_token(DECR);
PrimaryExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
}
final public void UnaryExpressionNotPlusMinus() throws ParseException {
@@ -687,7 +721,11 @@
throw new ParseException();
}
UnaryExpression();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
default:
jj_la1[26] = jj_gen;
@@ -718,8 +756,10 @@
}
}
-// This production is to determine lookahead only. The LOOKAHEAD specifications
-// below are not used, but they are there just to indicate that we know about
+ // This production is to determine lookahead only. The LOOKAHEAD
+ // specifications
+ // below are not used, but they are there just to indicate that we know
+ // about
// this.
final public void CastLookahead() throws ParseException {
if (jj_2_4(2)) {
@@ -792,7 +832,11 @@
break;
case DECR:
jj_consume_token(DECR);
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
default:
jj_la1[30] = jj_gen;
@@ -810,8 +854,7 @@
if (jj_2_6(2)) {
jj_consume_token(LPAREN);
PrimitiveType();
- label_14:
- while (true) {
+ label_14: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LBRACKET:
;
@@ -830,8 +873,7 @@
case LPAREN:
jj_consume_token(LPAREN);
Name();
- label_15:
- while (true) {
+ label_15: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LBRACKET:
;
@@ -856,8 +898,7 @@
final public void PrimaryExpression() throws ParseException {
PrimaryPrefix();
- label_16:
- while (true) {
+ label_16: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LPAREN:
case LBRACKET:
@@ -896,7 +937,11 @@
jj_consume_token(SUPER);
jj_consume_token(DOT);
jj_consume_token(IDENTIFIER);
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
case LPAREN:
jj_consume_token(LPAREN);
@@ -914,7 +959,7 @@
}
final public void PrimarySuffix() throws ParseException {
- List argList;
+ List<Value> argList;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case LBRACKET:
jj_consume_token(LBRACKET);
@@ -992,8 +1037,8 @@
jj_consume_token(NULL);
}
- final public List Arguments() throws ParseException {
- List argList = new ArrayList();
+ final public List<Value> Arguments() throws ParseException {
+ List<Value> argList = new ArrayList<Value>();
jj_consume_token(LPAREN);
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case FALSE:
@@ -1021,15 +1066,18 @@
;
}
jj_consume_token(RPAREN);
- {if (true) return argList;}
+ {
+ if (true) {
+ return argList;
+ }
+ }
throw new Error("Missing return statement in function");
}
- final public void ArgumentList(List argList) throws ParseException {
+ final public void ArgumentList(List<Value> argList) throws ParseException {
Expression();
argList.add(pop().interiorGetValue());
- label_17:
- while (true) {
+ label_17: while (true) {
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case COMMA:
;
@@ -1045,7 +1093,8 @@
}
final public void AllocationExpression() throws ParseException {
- List argList; String className;
+ List<Value> argList;
+ String className;
if (jj_2_7(2)) {
jj_consume_token(NEW);
PrimitiveType();
@@ -1062,7 +1111,11 @@
break;
case LBRACKET:
ArrayDimensions();
- {if (true) throw new ParseException("operation not yet supported");}
+ {
+ if (true) {
+ throw new ParseException("operation not yet supported");
+ }
+ }
break;
default:
jj_la1[42] = jj_gen;
@@ -1079,12 +1132,11 @@
}
/*
- * The second LOOKAHEAD specification below is to parse to PrimarySuffix
- * if there is an expression between the "[...]".
+ * The second LOOKAHEAD specification below is to parse to PrimarySuffix if
+ * there is an expression between the "[...]".
*/
final public void ArrayDimensions() throws ParseException {
- label_18:
- while (true) {
+ label_18: while (true) {
jj_consume_token(LBRACKET);
Expression();
jj_consume_token(RBRACKET);
@@ -1094,8 +1146,7 @@
break label_18;
}
}
- label_19:
- while (true) {
+ label_19: while (true) {
if (jj_2_9(2)) {
;
} else {
@@ -1107,71 +1158,84 @@
}
final private boolean jj_2_1(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_1();
jj_save(0, xla);
return retval;
}
final private boolean jj_2_2(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_2();
jj_save(1, xla);
return retval;
}
final private boolean jj_2_3(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_3();
jj_save(2, xla);
return retval;
}
final private boolean jj_2_4(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_4();
jj_save(3, xla);
return retval;
}
final private boolean jj_2_5(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_5();
jj_save(4, xla);
return retval;
}
final private boolean jj_2_6(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_6();
jj_save(5, xla);
return retval;
}
final private boolean jj_2_7(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_7();
jj_save(6, xla);
return retval;
}
final private boolean jj_2_8(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_8();
jj_save(7, xla);
return retval;
}
final private boolean jj_2_9(int xla) {
- jj_la = xla; jj_lastpos = jj_scanpos = token;
+ jj_la = xla;
+ jj_lastpos = jj_scanpos = token;
boolean retval = !jj_3_9();
jj_save(8, xla);
return retval;
}
final private boolean jj_3R_154() {
- if (jj_scan_token(INCR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INCR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1180,9 +1244,15 @@
xsp = jj_scanpos;
if (jj_3R_154()) {
jj_scanpos = xsp;
- if (jj_3R_155()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_155()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1191,27 +1261,54 @@
xsp = jj_scanpos;
if (jj_3_6()) {
jj_scanpos = xsp;
- if (jj_3R_150()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_150()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_6() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_23()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_23()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_152()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- }
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_152()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1220,45 +1317,86 @@
xsp = jj_scanpos;
if (jj_3R_50()) {
jj_scanpos = xsp;
- if (jj_3R_51()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_51()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_50() {
- if (jj_3R_67()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_67()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_5() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_149() {
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_151()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_151()) {
+ jj_scanpos = xsp;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_41() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
if (jj_3R_59()) {
@@ -1275,51 +1413,109 @@
jj_scanpos = xsp;
if (jj_3R_65()) {
jj_scanpos = xsp;
- if (jj_3R_66()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_66()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_40() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_123() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_1() {
- if (jj_scan_token(DOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DOT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_4() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_23()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_23()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1330,76 +1526,129 @@
jj_scanpos = xsp;
if (jj_3R_40()) {
jj_scanpos = xsp;
- if (jj_3R_41()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_41()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_3() {
- if (jj_3R_22()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_22()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_24() {
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3_1()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3_1()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_147() {
- if (jj_scan_token(BANG)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BANG)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_142() {
- if (jj_3R_149()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_149()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_122() {
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_49() {
- if (jj_scan_token(DOUBLE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DOUBLE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_141() {
- if (jj_3R_148()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_148()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_48() {
- if (jj_scan_token(FLOAT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(FLOAT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_146() {
- if (jj_scan_token(TILDE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(TILDE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_47() {
- if (jj_scan_token(LONG)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LONG)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1408,11 +1657,21 @@
xsp = jj_scanpos;
if (jj_3R_146()) {
jj_scanpos = xsp;
- if (jj_3R_147()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_147()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1423,48 +1682,84 @@
jj_scanpos = xsp;
if (jj_3R_141()) {
jj_scanpos = xsp;
- if (jj_3R_142()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_142()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_46() {
- if (jj_scan_token(INT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_145() {
- if (jj_scan_token(REM)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(REM)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_45() {
- if (jj_scan_token(SHORT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SHORT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_44() {
- if (jj_scan_token(BYTE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BYTE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_135() {
- if (jj_scan_token(DECR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DECR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_43() {
- if (jj_scan_token(CHAR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(CHAR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1485,49 +1780,95 @@
jj_scanpos = xsp;
if (jj_3R_48()) {
jj_scanpos = xsp;
- if (jj_3R_49()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_49()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_42() {
- if (jj_scan_token(BOOLEAN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BOOLEAN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_9() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_121() {
- if (jj_3R_23()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_23()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_144() {
- if (jj_scan_token(SLASH)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SLASH)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_134() {
- if (jj_scan_token(INCR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INCR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1536,62 +1877,105 @@
xsp = jj_scanpos;
if (jj_3R_121()) {
jj_scanpos = xsp;
- if (jj_3R_122()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_122()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
while (true) {
xsp = jj_scanpos;
- if (jj_3R_123()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_123()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_120() {
- if (jj_scan_token(GE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(GE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_133() {
- if (jj_scan_token(MINUS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(MINUS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_127() {
- if (jj_3R_136()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_136()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_126() {
- if (jj_3R_135()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_135()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_139() {
- if (jj_scan_token(MINUS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(MINUS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_125() {
- if (jj_3R_134()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_134()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_132() {
- if (jj_scan_token(PLUS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(PLUS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_143() {
- if (jj_scan_token(STAR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(STAR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1600,11 +1984,21 @@
xsp = jj_scanpos;
if (jj_3R_132()) {
jj_scanpos = xsp;
- if (jj_3R_133()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_133()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1617,11 +2011,21 @@
jj_scanpos = xsp;
if (jj_3R_126()) {
jj_scanpos = xsp;
- if (jj_3R_127()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_127()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1632,54 +2036,95 @@
jj_scanpos = xsp;
if (jj_3R_144()) {
jj_scanpos = xsp;
- if (jj_3R_145()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_145()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_131() {
- if (jj_scan_token(RUNSIGNEDSHIFT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(RUNSIGNEDSHIFT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_119() {
- if (jj_scan_token(LE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_138() {
- if (jj_scan_token(PLUS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(PLUS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_112() {
- if (jj_3R_115()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_115()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_137()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_137()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_88() {
- if (jj_3R_86()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_86()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_130() {
- if (jj_scan_token(RSIGNEDSHIFT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(RSIGNEDSHIFT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1688,29 +2133,51 @@
xsp = jj_scanpos;
if (jj_3R_138()) {
jj_scanpos = xsp;
- if (jj_3R_139()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_112()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_139()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_112()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_87() {
- if (jj_3R_82()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_82()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_118() {
- if (jj_scan_token(GT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(GT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_129() {
- if (jj_scan_token(LSHIFT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LSHIFT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1721,68 +2188,128 @@
jj_scanpos = xsp;
if (jj_3R_130()) {
jj_scanpos = xsp;
- if (jj_3R_131()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_108()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_131()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_108()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_108() {
- if (jj_3R_112()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_112()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_128()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_128()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3_8() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_86() {
Token xsp;
- if (jj_3_8()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3_8()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
while (true) {
xsp = jj_scanpos;
- if (jj_3_8()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3_8()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
while (true) {
xsp = jj_scanpos;
- if (jj_3_9()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3_9()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_117() {
- if (jj_scan_token(LT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_106() {
- if (jj_3R_108()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_108()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_116()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_116()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
@@ -1796,64 +2323,125 @@
jj_scanpos = xsp;
if (jj_3R_119()) {
jj_scanpos = xsp;
- if (jj_3R_120()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_106()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_120()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_106()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_111() {
- if (jj_scan_token(NE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_109() {
- if (jj_scan_token(INSTANCEOF)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_114()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INSTANCEOF)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_114()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_104() {
- if (jj_3R_106()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_106()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_113()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_113()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_81() {
- if (jj_scan_token(NEW)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NEW)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
if (jj_3R_87()) {
jj_scanpos = xsp;
- if (jj_3R_88()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_88()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_7() {
- if (jj_scan_token(NEW)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_23()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_86()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NEW)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_23()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_86()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1862,39 +2450,68 @@
xsp = jj_scanpos;
if (jj_3_7()) {
jj_scanpos = xsp;
- if (jj_3R_81()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_81()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_97() {
- if (jj_scan_token(COMMA)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(COMMA)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_39() {
- if (jj_scan_token(ORASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(ORASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_110() {
- if (jj_scan_token(EQ)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(EQ)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_102() {
- if (jj_3R_104()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_104()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_109()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_109()) {
+ jj_scanpos = xsp;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -1903,117 +2520,209 @@
xsp = jj_scanpos;
if (jj_3R_110()) {
jj_scanpos = xsp;
- if (jj_3R_111()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_102()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_111()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_102()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_94() {
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_97()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_97()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_89() {
- if (jj_3R_94()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_94()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_38() {
- if (jj_scan_token(XORASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(XORASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_82() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_89()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_89()) {
+ jj_scanpos = xsp;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_105() {
- if (jj_scan_token(BIT_AND)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_100()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BIT_AND)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_100()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_100() {
- if (jj_3R_102()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_102()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_107()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_107()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_37() {
- if (jj_scan_token(ANDASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(ANDASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_85() {
- if (jj_scan_token(NULL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NULL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_103() {
- if (jj_scan_token(XOR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_98()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(XOR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_98()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_98() {
- if (jj_3R_100()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_100()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_105()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_105()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_92() {
- if (jj_scan_token(FALSE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(FALSE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_36() {
- if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(RUNSIGNEDSHIFTASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_91() {
- if (jj_scan_token(TRUE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(TRUE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2022,109 +2731,189 @@
xsp = jj_scanpos;
if (jj_3R_91()) {
jj_scanpos = xsp;
- if (jj_3R_92()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_92()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_101() {
- if (jj_scan_token(BIT_OR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_95()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BIT_OR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_95()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_95() {
- if (jj_3R_98()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_98()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_103()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_103()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_35() {
- if (jj_scan_token(RSIGNEDSHIFTASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(RSIGNEDSHIFTASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_80() {
- if (jj_3R_85()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_85()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_66() {
- if (jj_3R_69()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_69()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_79() {
- if (jj_3R_84()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_84()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_78() {
- if (jj_scan_token(STRING_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(STRING_LITERAL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_99() {
- if (jj_scan_token(SC_AND)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_90()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SC_AND)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_90()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_90() {
- if (jj_3R_95()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_95()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_101()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_101()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_34() {
- if (jj_scan_token(LSHIFTASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LSHIFTASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_65() {
- if (jj_scan_token(NEW)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(NEW)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_77() {
- if (jj_scan_token(CHARACTER_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(CHARACTER_LITERAL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_76() {
- if (jj_scan_token(FLOATING_POINT_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(FLOATING_POINT_LITERAL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_33() {
- if (jj_scan_token(MINUSASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(MINUSASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2141,89 +2930,161 @@
jj_scanpos = xsp;
if (jj_3R_79()) {
jj_scanpos = xsp;
- if (jj_3R_80()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_80()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_75() {
- if (jj_scan_token(INTEGER_LITERAL)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(INTEGER_LITERAL)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_96() {
- if (jj_scan_token(SC_OR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_83()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SC_OR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_83()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_83() {
- if (jj_3R_90()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_90()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_99()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_99()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_64() {
- if (jj_scan_token(SUPER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SUPER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_32() {
- if (jj_scan_token(PLUSASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(PLUSASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_73() {
- if (jj_3R_82()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_82()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_72() {
- if (jj_scan_token(DOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DOT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_74() {
- if (jj_3R_83()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_83()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_96()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_96()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_63() {
- if (jj_scan_token(THIS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(THIS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_31() {
- if (jj_scan_token(REMASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(REMASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2234,120 +3095,231 @@
jj_scanpos = xsp;
if (jj_3R_72()) {
jj_scanpos = xsp;
- if (jj_3R_73()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_73()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_71() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_93() {
- if (jj_scan_token(HOOK)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(COLON)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(HOOK)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(COLON)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_68()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_57() {
- if (jj_3R_70()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_70()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_30() {
- if (jj_scan_token(SLASHASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SLASHASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_27() {
- if (jj_3R_58()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_58()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_56() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_152() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_55() {
- if (jj_scan_token(SUPER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(DOT)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(SUPER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(DOT)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_29() {
- if (jj_scan_token(STARASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(STARASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_68() {
- if (jj_3R_74()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_74()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
xsp = jj_scanpos;
- if (jj_3R_93()) jj_scanpos = xsp;
- else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_93()) {
+ jj_scanpos = xsp;
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_54() {
- if (jj_scan_token(THIS)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(THIS)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_62() {
- if (jj_scan_token(IDENTIFIER)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(IDENTIFIER)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_53() {
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_153() {
- if (jj_scan_token(LBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_scan_token(RBRACKET)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_scan_token(RBRACKET)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2364,19 +3336,37 @@
jj_scanpos = xsp;
if (jj_3R_56()) {
jj_scanpos = xsp;
- if (jj_3R_57()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_57()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_52() {
- if (jj_3R_69()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_69()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2405,103 +3395,206 @@
jj_scanpos = xsp;
if (jj_3R_38()) {
jj_scanpos = xsp;
- if (jj_3R_39()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- } else if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_39()) {
+ return true;
+ }
+ if (jj_la == 0
+ && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0
+ && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0
+ && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ } else if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_28() {
- if (jj_scan_token(ASSIGN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(ASSIGN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_61() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3_2() {
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_21()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_21()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_20() {
- if (jj_3R_26()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_26()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_27()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_27()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
}
return false;
}
final private boolean jj_3R_60() {
- if (jj_scan_token(BANG)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(BANG)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_155() {
- if (jj_scan_token(DECR)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(DECR)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_67() {
- if (jj_3R_20()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_21()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_25()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_20()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_21()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_25()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_150() {
- if (jj_scan_token(LPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_24()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(LPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_24()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
Token xsp;
while (true) {
xsp = jj_scanpos;
- if (jj_3R_153()) { jj_scanpos = xsp; break; }
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- }
- if (jj_scan_token(RPAREN)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
- if (jj_3R_136()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_153()) {
+ jj_scanpos = xsp;
+ break;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ }
+ if (jj_scan_token(RPAREN)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
+ if (jj_3R_136()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_59() {
- if (jj_scan_token(TILDE)) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_scan_token(TILDE)) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
final private boolean jj_3R_51() {
- if (jj_3R_68()) return true;
- if (jj_la == 0 && jj_scanpos == jj_lastpos) return false;
+ if (jj_3R_68()) {
+ return true;
+ }
+ if (jj_la == 0 && jj_scanpos == jj_lastpos) {
+ return false;
+ }
return false;
}
@@ -2512,13 +3605,28 @@
private Token jj_scanpos, jj_lastpos;
private int jj_la;
public boolean lookingAhead = false;
- private boolean jj_semLA;
private int jj_gen;
final private int[] jj_la1 = new int[44];
- final private int[] jj_la1_0 = {0x8209400,0x0,0x8209400,0x0,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x0,0x1000000,0x1000000,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x1000000,0x0,0x1000000,0x1000000,0x1000000,0x0,0x0,0x0,};
- final private int[] jj_la1_1 = {0x2014,0x0,0x2014,0x0,0x884480c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x884480c0,0x0,0x0,0x884480c0,0x884480c0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x884480c0,0x0,0x88400080,0x400000,0x884480c0,0x0,0x0,0x40,};
- final private int[] jj_la1_2 = {0x8,0x400,0x0,0x2000,0xf00c004e,0x8000,0x100000,0x4000000,0x8000000,0x0,0x0,0x0,0x2400000,0x2400000,0x0,0x1830000,0x1830000,0x0,0x0,0xc0000000,0xc0000000,0x0,0x0,0xc0000000,0xf00c004e,0xc0000,0xc0000,0x4e,0xc004e,0x40,0x30000000,0x30000000,0x400,0x400,0x40,0x4440,0x4e,0x4440,0x6,0x0,0xf00c004e,0x2000,0x440,0x0,};
- final private int[] jj_la1_3 = {0x0,0x0,0x0,0x0,0x0,0xffe00,0x0,0x0,0x0,0x8,0x10,0x4,0x0,0x0,0x0,0x0,0x0,0x1c0,0x1c0,0x0,0x0,0x23,0x23,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,0x0,};
+ final private int[] jj_la1_0 = { 0x8209400, 0x0, 0x8209400, 0x0, 0x1000000,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x0, 0x1000000, 0x1000000,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1000000, 0x0, 0x1000000,
+ 0x1000000, 0x1000000, 0x0, 0x0, 0x0, };
+ final private int[] jj_la1_1 = { 0x2014, 0x0, 0x2014, 0x0, 0x884480c0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x2, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x884480c0, 0x0, 0x0, 0x884480c0, 0x884480c0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x884480c0, 0x0, 0x88400080, 0x400000,
+ 0x884480c0, 0x0, 0x0, 0x40, };
+ final private int[] jj_la1_2 = { 0x8, 0x400, 0x0, 0x2000, 0xf00c004e,
+ 0x8000, 0x100000, 0x4000000, 0x8000000, 0x0, 0x0, 0x0, 0x2400000,
+ 0x2400000, 0x0, 0x1830000, 0x1830000, 0x0, 0x0, 0xc0000000,
+ 0xc0000000, 0x0, 0x0, 0xc0000000, 0xf00c004e, 0xc0000, 0xc0000, 0x4e,
+ 0xc004e, 0x40, 0x30000000, 0x30000000, 0x400, 0x400, 0x40, 0x4440,
+ 0x4e, 0x4440, 0x6, 0x0, 0xf00c004e, 0x2000, 0x440, 0x0, };
+ final private int[] jj_la1_3 = { 0x0, 0x0, 0x0, 0x0, 0x0, 0xffe00, 0x0, 0x0,
+ 0x0, 0x8, 0x10, 0x4, 0x0, 0x0, 0x0, 0x0, 0x0, 0x1c0, 0x1c0, 0x0, 0x0,
+ 0x23, 0x23, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+ 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, };
final private JJExpressionParserCalls[] jj_2_rtns = new JJExpressionParserCalls[9];
private boolean jj_rescan = false;
private int jj_gc = 0;
@@ -2529,8 +3637,12 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 44; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls();
+ for (int i = 0; i < 44; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJExpressionParserCalls();
+ }
}
public void ReInit(java.io.InputStream stream) {
@@ -2539,8 +3651,12 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 44; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls();
+ for (int i = 0; i < 44; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJExpressionParserCalls();
+ }
}
public ExpressionParser(ExpressionParserTokenManager tm) {
@@ -2548,8 +3664,12 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 44; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls();
+ for (int i = 0; i < 44; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJExpressionParserCalls();
+ }
}
public void ReInit(ExpressionParserTokenManager tm) {
@@ -2557,23 +3677,32 @@
token = new Token();
jj_ntk = -1;
jj_gen = 0;
- for (int i = 0; i < 44; i++) jj_la1[i] = -1;
- for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJExpressionParserCalls();
+ for (int i = 0; i < 44; i++) {
+ jj_la1[i] = -1;
+ }
+ for (int i = 0; i < jj_2_rtns.length; i++) {
+ jj_2_rtns[i] = new JJExpressionParserCalls();
+ }
}
final private Token jj_consume_token(int kind) throws ParseException {
Token oldToken;
- if ((oldToken = token).next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
+ if ((oldToken = token).next != null) {
+ token = token.next;
+ } else {
+ token = token.next = token_source.getNextToken();
+ }
jj_ntk = -1;
if (token.kind == kind) {
jj_gen++;
if (++jj_gc > 100) {
jj_gc = 0;
- for (int i = 0; i < jj_2_rtns.length; i++) {
- JJExpressionParserCalls c = jj_2_rtns[i];
+ for (JJExpressionParserCalls jj_2_rtn : jj_2_rtns) {
+ JJExpressionParserCalls c = jj_2_rtn;
while (c != null) {
- if (c.gen < jj_gen) c.first = null;
+ if (c.gen < jj_gen) {
+ c.first = null;
+ }
c = c.next;
}
}
@@ -2589,7 +3718,8 @@
if (jj_scanpos == jj_lastpos) {
jj_la--;
if (jj_scanpos.next == null) {
- jj_lastpos = jj_scanpos = jj_scanpos.next = token_source.getNextToken();
+ jj_lastpos = jj_scanpos = jj_scanpos.next = token_source
+ .getNextToken();
} else {
jj_lastpos = jj_scanpos = jj_scanpos.next;
}
@@ -2597,16 +3727,25 @@
jj_scanpos = jj_scanpos.next;
}
if (jj_rescan) {
- int i = 0; Token tok = token;
- while (tok != null && tok != jj_scanpos) { i++; tok = tok.next; }
- if (tok != null) jj_add_error_token(kind, i);
+ int i = 0;
+ Token tok = token;
+ while (tok != null && tok != jj_scanpos) {
+ i++;
+ tok = tok.next;
+ }
+ if (tok != null) {
+ jj_add_error_token(kind, i);
+ }
}
return (jj_scanpos.kind != kind);
}
final public Token getNextToken() {
- if (token.next != null) token = token.next;
- else token = token.next = token_source.getNextToken();
+ if (token.next != null) {
+ token = token.next;
+ } else {
+ token = token.next = token_source.getNextToken();
+ }
jj_ntk = -1;
jj_gen++;
return token;
@@ -2615,27 +3754,33 @@
final public Token getToken(int index) {
Token t = lookingAhead ? jj_scanpos : token;
for (int i = 0; i < index; i++) {
- if (t.next != null) t = t.next;
- else t = t.next = token_source.getNextToken();
+ if (t.next != null) {
+ t = t.next;
+ } else {
+ t = t.next = token_source.getNextToken();
+ }
}
return t;
}
final private int jj_ntk() {
- if ((jj_nt=token.next) == null)
+ if ((jj_nt = token.next) == null) {
return (jj_ntk = (token.next=token_source.getNextToken()).kind);
- else
+ } else {
return (jj_ntk = jj_nt.kind);
}
+ }
- private java.util.Vector jj_expentries = new java.util.Vector();
+ private java.util.Vector<int[]> jj_expentries = new java.util.Vector<int[]>();
private int[] jj_expentry;
private int jj_kind = -1;
private int[] jj_lasttokens = new int[100];
private int jj_endpos;
private void jj_add_error_token(int kind, int pos) {
- if (pos >= 100) return;
+ if (pos >= 100) {
+ return;
+ }
if (pos == jj_endpos + 1) {
jj_lasttokens[jj_endpos++] = kind;
} else if (jj_endpos != 0) {
@@ -2644,8 +3789,9 @@
jj_expentry[i] = jj_lasttokens[i];
}
boolean exists = false;
- for (java.util.Enumeration enum_ = jj_expentries.elements(); enum_.hasMoreElements();) {
- int[] oldentry = (int[])(enum_.nextElement());
+ for (java.util.Enumeration<int[]> enum_ = jj_expentries.elements(); enum_
+ .hasMoreElements();) {
+ int[] oldentry = (enum_.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
for (int i = 0; i < jj_expentry.length; i++) {
@@ -2654,11 +3800,17 @@
break;
}
}
- if (exists) break;
- }
- }
- if (!exists) jj_expentries.addElement(jj_expentry);
- if (pos != 0) jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+ if (exists) {
+ break;
+ }
+ }
+ }
+ if (!exists) {
+ jj_expentries.addElement(jj_expentry);
+ }
+ if (pos != 0) {
+ jj_lasttokens[(jj_endpos = pos) - 1] = kind;
+ }
}
}
@@ -2702,7 +3854,7 @@
jj_add_error_token(0, 0);
int[][] exptokseq = new int[jj_expentries.size()][];
for (int i = 0; i < jj_expentries.size(); i++) {
- exptokseq[i] = (int[])jj_expentries.elementAt(i);
+ exptokseq[i] = jj_expentries.elementAt(i);
}
return new ParseException(token, exptokseq, tokenImage);
}
@@ -2719,17 +3871,36 @@
JJExpressionParserCalls p = jj_2_rtns[i];
do {
if (p.gen > jj_gen) {
- jj_la = p.arg; jj_lastpos = jj_scanpos = p.first;
+ jj_la = p.arg;
+ jj_lastpos = jj_scanpos = p.first;
switch (i) {
- case 0: jj_3_1(); break;
- case 1: jj_3_2(); break;
- case 2: jj_3_3(); break;
- case 3: jj_3_4(); break;
- case 4: jj_3_5(); break;
- case 5: jj_3_6(); break;
- case 6: jj_3_7(); break;
- case 7: jj_3_8(); break;
- case 8: jj_3_9(); break;
+ case 0:
+ jj_3_1();
+ break;
+ case 1:
+ jj_3_2();
+ break;
+ case 2:
+ jj_3_3();
+ break;
+ case 3:
+ jj_3_4();
+ break;
+ case 4:
+ jj_3_5();
+ break;
+ case 5:
+ jj_3_6();
+ break;
+ case 6:
+ jj_3_7();
+ break;
+ case 7:
+ jj_3_8();
+ break;
+ case 8:
+ jj_3_9();
+ break;
}
}
p = p.next;
@@ -2741,10 +3912,15 @@
final private void jj_save(int index, int xla) {
JJExpressionParserCalls p = jj_2_rtns[index];
while (p.gen > jj_gen) {
- if (p.next == null) { p = p.next = new JJExpressionParserCalls(); break; }
+ if (p.next == null) {
+ p = p.next = new JJExpressionParserCalls();
+ break;
+ }
p = p.next;
}
- p.gen = jj_gen + xla - jj_la; p.first = token; p.arg = xla;
+ p.gen = jj_gen + xla - jj_la;
+ p.first = token;
+ p.arg = xla;
}
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ExpressionParserTokenManager.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,10 +25,6 @@
/* Generated By:JavaCC: Do not edit this line. ExpressionParserTokenManager.java */
package com.sun.tools.example.debug.expr;
-import com.sun.jdi.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
public class ExpressionParserTokenManager implements ExpressionParserConstants
{
@@ -37,15 +33,17 @@
switch (pos)
{
case 0:
- if ((active1 & 0x4000L) != 0L)
+ if ((active1 & 0x4000L) != 0L) {
return 4;
+ }
if ((active0 & 0x7fffffffffffe00L) != 0L)
{
jjmatchedKind = 67;
return 28;
}
- if ((active1 & 0x100200000000L) != 0L)
+ if ((active1 & 0x100200000000L) != 0L) {
return 49;
+ }
return -1;
case 1:
if ((active0 & 0x7ffffffbfcffe00L) != 0L)
@@ -57,8 +55,9 @@
}
return 28;
}
- if ((active0 & 0x40300000L) != 0L)
+ if ((active0 & 0x40300000L) != 0L) {
return 28;
+ }
return -1;
case 2:
if ((active0 & 0x77fffb3afeffe00L) != 0L)
@@ -70,8 +69,9 @@
}
return 28;
}
- if ((active0 & 0x80004c10000000L) != 0L)
+ if ((active0 & 0x80004c10000000L) != 0L) {
return 28;
+ }
return -1;
case 3:
if ((active0 & 0x63bff2b8faf4e00L) != 0L)
@@ -80,8 +80,9 @@
jjmatchedPos = 3;
return 28;
}
- if ((active0 & 0x14400902040b000L) != 0L)
+ if ((active0 & 0x14400902040b000L) != 0L) {
return 28;
+ }
return -1;
case 4:
if ((active0 & 0x2235f2b80ac0600L) != 0L)
@@ -93,8 +94,9 @@
}
return 28;
}
- if ((active0 & 0x418a0000f034800L) != 0L)
+ if ((active0 & 0x418a0000f034800L) != 0L) {
return 28;
+ }
return -1;
case 5:
if ((active0 & 0x222070a848c0600L) != 0L)
@@ -103,8 +105,9 @@
jjmatchedPos = 5;
return 28;
}
- if ((active0 & 0x11582100200000L) != 0L)
+ if ((active0 & 0x11582100200000L) != 0L) {
return 28;
+ }
return -1;
case 6:
if ((active0 & 0x222040a80040200L) != 0L)
@@ -113,8 +116,9 @@
jjmatchedPos = 6;
return 28;
}
- if ((active0 & 0x30004880400L) != 0L)
+ if ((active0 & 0x30004880400L) != 0L) {
return 28;
+ }
return -1;
case 7:
if ((active0 & 0x22040a80000000L) != 0L)
@@ -123,8 +127,9 @@
jjmatchedPos = 7;
return 28;
}
- if ((active0 & 0x200000000040200L) != 0L)
+ if ((active0 & 0x200000000040200L) != 0L) {
return 28;
+ }
return -1;
case 8:
if ((active0 & 0x2000280000000L) != 0L)
@@ -133,8 +138,9 @@
jjmatchedPos = 8;
return 28;
}
- if ((active0 & 0x20040800000000L) != 0L)
+ if ((active0 & 0x20040800000000L) != 0L) {
return 28;
+ }
return -1;
case 9:
if ((active0 & 0x2000000000000L) != 0L)
@@ -143,8 +149,9 @@
jjmatchedPos = 9;
return 28;
}
- if ((active0 & 0x280000000L) != 0L)
+ if ((active0 & 0x280000000L) != 0L) {
return 28;
+ }
return -1;
case 10:
if ((active0 & 0x2000000000000L) != 0L)
@@ -286,16 +293,19 @@
switch(curChar)
{
case 38:
- if ((active1 & 0x8000000L) != 0L)
+ if ((active1 & 0x8000000L) != 0L) {
return jjStopAtPos(1, 91);
+ }
break;
case 43:
- if ((active1 & 0x10000000L) != 0L)
+ if ((active1 & 0x10000000L) != 0L) {
return jjStopAtPos(1, 92);
+ }
break;
case 45:
- if ((active1 & 0x20000000L) != 0L)
+ if ((active1 & 0x20000000L) != 0L) {
return jjStopAtPos(1, 93);
+ }
break;
case 60:
if ((active1 & 0x4000000000L) != 0L)
@@ -305,30 +315,31 @@
}
return jjMoveStringLiteralDfa2_0(active0, 0L, active1, 0x2000000000000L);
case 61:
- if ((active1 & 0x400000L) != 0L)
+ if ((active1 & 0x400000L) != 0L) {
return jjStopAtPos(1, 86);
- else if ((active1 & 0x800000L) != 0L)
+ } else if ((active1 & 0x800000L) != 0L) {
return jjStopAtPos(1, 87);
- else if ((active1 & 0x1000000L) != 0L)
+ } else if ((active1 & 0x1000000L) != 0L) {
return jjStopAtPos(1, 88);
- else if ((active1 & 0x2000000L) != 0L)
+ } else if ((active1 & 0x2000000L) != 0L) {
return jjStopAtPos(1, 89);
- else if ((active1 & 0x20000000000L) != 0L)
+ } else if ((active1 & 0x20000000000L) != 0L) {
return jjStopAtPos(1, 105);
- else if ((active1 & 0x40000000000L) != 0L)
+ } else if ((active1 & 0x40000000000L) != 0L) {
return jjStopAtPos(1, 106);
- else if ((active1 & 0x80000000000L) != 0L)
+ } else if ((active1 & 0x80000000000L) != 0L) {
return jjStopAtPos(1, 107);
- else if ((active1 & 0x100000000000L) != 0L)
+ } else if ((active1 & 0x100000000000L) != 0L) {
return jjStopAtPos(1, 108);
- else if ((active1 & 0x200000000000L) != 0L)
+ } else if ((active1 & 0x200000000000L) != 0L) {
return jjStopAtPos(1, 109);
- else if ((active1 & 0x400000000000L) != 0L)
+ } else if ((active1 & 0x400000000000L) != 0L) {
return jjStopAtPos(1, 110);
- else if ((active1 & 0x800000000000L) != 0L)
+ } else if ((active1 & 0x800000000000L) != 0L) {
return jjStopAtPos(1, 111);
- else if ((active1 & 0x1000000000000L) != 0L)
+ } else if ((active1 & 0x1000000000000L) != 0L) {
return jjStopAtPos(1, 112);
+ }
break;
case 62:
if ((active1 & 0x8000000000L) != 0L)
@@ -344,8 +355,9 @@
case 101:
return jjMoveStringLiteralDfa2_0(active0, 0x104000080000L, active1, 0L);
case 102:
- if ((active0 & 0x40000000L) != 0L)
+ if ((active0 & 0x40000000L) != 0L) {
return jjStartNfaWithStates_0(1, 30, 28);
+ }
break;
case 104:
return jjMoveStringLiteralDfa2_0(active0, 0x41c200000008000L, active1, 0L);
@@ -377,8 +389,9 @@
case 121:
return jjMoveStringLiteralDfa2_0(active0, 0x2000000001000L, active1, 0L);
case 124:
- if ((active1 & 0x4000000L) != 0L)
+ if ((active1 & 0x4000000L) != 0L) {
return jjStopAtPos(1, 90);
+ }
break;
default :
break;
@@ -387,8 +400,9 @@
}
private final int jjMoveStringLiteralDfa2_0(long old0, long active0, long old1, long active1)
{
- if (((active0 &= old0) | (active1 &= old1)) == 0L)
+ if (((active0 &= old0) | (active1 &= old1)) == 0L) {
return jjStartNfa_0(0, old0, old1);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(1, active0, active1);
@@ -397,10 +411,11 @@
switch(curChar)
{
case 61:
- if ((active1 & 0x2000000000000L) != 0L)
+ if ((active1 & 0x2000000000000L) != 0L) {
return jjStopAtPos(2, 113);
- else if ((active1 & 0x4000000000000L) != 0L)
+ } else if ((active1 & 0x4000000000000L) != 0L) {
return jjStopAtPos(2, 114);
+ }
break;
case 62:
if ((active1 & 0x10000000000L) != 0L)
@@ -430,8 +445,9 @@
case 112:
return jjMoveStringLiteralDfa3_0(active0, 0x800180000000L, active1, 0L);
case 114:
- if ((active0 & 0x10000000L) != 0L)
+ if ((active0 & 0x10000000L) != 0L) {
return jjStartNfaWithStates_0(2, 28, 28);
+ }
return jjMoveStringLiteralDfa3_0(active0, 0x18000000000000L, active1, 0L);
case 115:
return jjMoveStringLiteralDfa3_0(active0, 0x200402200L, active1, 0L);
@@ -445,12 +461,14 @@
case 117:
return jjMoveStringLiteralDfa3_0(active0, 0x40000000200000L, active1, 0L);
case 119:
- if ((active0 & 0x4000000000L) != 0L)
+ if ((active0 & 0x4000000000L) != 0L) {
return jjStartNfaWithStates_0(2, 38, 28);
+ }
break;
case 121:
- if ((active0 & 0x80000000000000L) != 0L)
+ if ((active0 & 0x80000000000000L) != 0L) {
return jjStartNfaWithStates_0(2, 55, 28);
+ }
break;
default :
break;
@@ -459,8 +477,9 @@
}
private final int jjMoveStringLiteralDfa3_0(long old0, long active0, long old1, long active1)
{
- if (((active0 &= old0) | (active1 &= old1)) == 0L)
+ if (((active0 &= old0) | (active1 &= old1)) == 0L) {
return jjStartNfa_0(1, old0, old1);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(2, active0, active1);
@@ -469,8 +488,9 @@
switch(curChar)
{
case 61:
- if ((active1 & 0x8000000000000L) != 0L)
+ if ((active1 & 0x8000000000000L) != 0L) {
return jjStopAtPos(3, 115);
+ }
break;
case 97:
return jjMoveStringLiteralDfa4_0(active0, 0x20000000e080800L, active1, 0L);
@@ -479,44 +499,51 @@
case 99:
return jjMoveStringLiteralDfa4_0(active0, 0x2000000004000L, active1, 0L);
case 100:
- if ((active0 & 0x100000000000000L) != 0L)
+ if ((active0 & 0x100000000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 56, 28);
+ }
break;
case 101:
- if ((active0 & 0x1000L) != 0L)
+ if ((active0 & 0x1000L) != 0L) {
return jjStartNfaWithStates_0(3, 12, 28);
- else if ((active0 & 0x2000L) != 0L)
+ } else if ((active0 & 0x2000L) != 0L) {
return jjStartNfaWithStates_0(3, 13, 28);
- else if ((active0 & 0x400000L) != 0L)
+ } else if ((active0 & 0x400000L) != 0L) {
return jjStartNfaWithStates_0(3, 22, 28);
- else if ((active0 & 0x40000000000000L) != 0L)
+ } else if ((active0 & 0x40000000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 54, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x800800800000L, active1, 0L);
case 103:
- if ((active0 & 0x1000000000L) != 0L)
+ if ((active0 & 0x1000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 36, 28);
+ }
break;
case 105:
return jjMoveStringLiteralDfa4_0(active0, 0x2000000000L, active1, 0L);
case 107:
return jjMoveStringLiteralDfa4_0(active0, 0x10000000000L, active1, 0L);
case 108:
- if ((active0 & 0x8000000000L) != 0L)
+ if ((active0 & 0x8000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 39, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x400080080000400L, active1, 0L);
case 110:
return jjMoveStringLiteralDfa4_0(active0, 0x20000000000000L, active1, 0L);
case 111:
- if ((active0 & 0x20000000L) != 0L)
+ if ((active0 & 0x20000000L) != 0L) {
return jjStartNfaWithStates_0(3, 29, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x18000100000000L, active1, 0L);
case 114:
- if ((active0 & 0x8000L) != 0L)
+ if ((active0 & 0x8000L) != 0L) {
return jjStartNfaWithStates_0(3, 15, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x200000000000L, active1, 0L);
case 115:
- if ((active0 & 0x4000000000000L) != 0L)
+ if ((active0 & 0x4000000000000L) != 0L) {
return jjStartNfaWithStates_0(3, 50, 28);
+ }
return jjMoveStringLiteralDfa4_0(active0, 0x1030000L, active1, 0L);
case 116:
return jjMoveStringLiteralDfa4_0(active0, 0x1440200040200L, active1, 0L);
@@ -531,8 +558,9 @@
}
private final int jjMoveStringLiteralDfa4_0(long old0, long active0, long old1, long active1)
{
- if (((active0 &= old0) | (active1 &= old1)) == 0L)
+ if (((active0 &= old0) | (active1 &= old1)) == 0L) {
return jjStartNfa_0(2, old0, old1);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(3, active0, 0L);
@@ -545,20 +573,23 @@
case 99:
return jjMoveStringLiteralDfa5_0(active0, 0x1000000000000L);
case 101:
- if ((active0 & 0x1000000L) != 0L)
+ if ((active0 & 0x1000000L) != 0L) {
return jjStartNfaWithStates_0(4, 24, 28);
- else if ((active0 & 0x400000000000000L) != 0L)
+ } else if ((active0 & 0x400000000000000L) != 0L) {
return jjStartNfaWithStates_0(4, 58, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x40080000400L);
case 104:
- if ((active0 & 0x4000L) != 0L)
+ if ((active0 & 0x4000L) != 0L) {
return jjStartNfaWithStates_0(4, 14, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x2000000000000L);
case 105:
return jjMoveStringLiteralDfa5_0(active0, 0x480000040000L);
case 107:
- if ((active0 & 0x800L) != 0L)
+ if ((active0 & 0x800L) != 0L) {
return jjStartNfaWithStates_0(4, 11, 28);
+ }
break;
case 108:
if ((active0 & 0x2000000L) != 0L)
@@ -570,20 +601,23 @@
case 110:
return jjMoveStringLiteralDfa5_0(active0, 0x800000L);
case 114:
- if ((active0 & 0x800000000000L) != 0L)
+ if ((active0 & 0x800000000000L) != 0L) {
return jjStartNfaWithStates_0(4, 47, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x100900000200L);
case 115:
- if ((active0 & 0x10000L) != 0L)
+ if ((active0 & 0x10000L) != 0L) {
return jjStartNfaWithStates_0(4, 16, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x20000000000000L);
case 116:
- if ((active0 & 0x20000L) != 0L)
+ if ((active0 & 0x20000L) != 0L) {
return jjStartNfaWithStates_0(4, 17, 28);
- else if ((active0 & 0x8000000L) != 0L)
+ } else if ((active0 & 0x8000000L) != 0L) {
return jjStartNfaWithStates_0(4, 27, 28);
- else if ((active0 & 0x200000000000L) != 0L)
+ } else if ((active0 & 0x200000000000L) != 0L) {
return jjStartNfaWithStates_0(4, 45, 28);
+ }
return jjMoveStringLiteralDfa5_0(active0, 0x200000000000000L);
case 117:
return jjMoveStringLiteralDfa5_0(active0, 0x80000L);
@@ -603,8 +637,9 @@
}
private final int jjMoveStringLiteralDfa5_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(3, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(4, active0, 0L);
@@ -615,26 +650,29 @@
case 97:
return jjMoveStringLiteralDfa6_0(active0, 0x600L);
case 99:
- if ((active0 & 0x80000000000L) != 0L)
+ if ((active0 & 0x80000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 43, 28);
- else if ((active0 & 0x400000000000L) != 0L)
+ } else if ((active0 & 0x400000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 46, 28);
+ }
return jjMoveStringLiteralDfa6_0(active0, 0x40000000000L);
case 100:
return jjMoveStringLiteralDfa6_0(active0, 0x800000L);
case 101:
- if ((active0 & 0x200000L) != 0L)
+ if ((active0 & 0x200000L) != 0L) {
return jjStartNfaWithStates_0(5, 21, 28);
- else if ((active0 & 0x2000000000L) != 0L)
+ } else if ((active0 & 0x2000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 37, 28);
+ }
break;
case 102:
return jjMoveStringLiteralDfa6_0(active0, 0x800000000L);
case 103:
return jjMoveStringLiteralDfa6_0(active0, 0x10000000000L);
case 104:
- if ((active0 & 0x1000000000000L) != 0L)
+ if ((active0 & 0x1000000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 48, 28);
+ }
break;
case 105:
return jjMoveStringLiteralDfa6_0(active0, 0x220000000000000L);
@@ -643,18 +681,21 @@
case 109:
return jjMoveStringLiteralDfa6_0(active0, 0x80000000L);
case 110:
- if ((active0 & 0x100000000000L) != 0L)
+ if ((active0 & 0x100000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 44, 28);
+ }
return jjMoveStringLiteralDfa6_0(active0, 0x200040000L);
case 114:
return jjMoveStringLiteralDfa6_0(active0, 0x2000000000000L);
case 115:
- if ((active0 & 0x10000000000000L) != 0L)
+ if ((active0 & 0x10000000000000L) != 0L) {
return jjStartNfaWithStates_0(5, 52, 28);
+ }
break;
case 116:
- if ((active0 & 0x100000000L) != 0L)
+ if ((active0 & 0x100000000L) != 0L) {
return jjStartNfaWithStates_0(5, 32, 28);
+ }
return jjMoveStringLiteralDfa6_0(active0, 0x20000000000L);
default :
break;
@@ -663,8 +704,9 @@
}
private final int jjMoveStringLiteralDfa6_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(4, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(5, active0, 0L);
@@ -677,32 +719,37 @@
case 99:
return jjMoveStringLiteralDfa7_0(active0, 0x200000200L);
case 101:
- if ((active0 & 0x10000000000L) != 0L)
+ if ((active0 & 0x10000000000L) != 0L) {
return jjStartNfaWithStates_0(6, 40, 28);
- else if ((active0 & 0x20000000000L) != 0L)
+ } else if ((active0 & 0x20000000000L) != 0L) {
return jjStartNfaWithStates_0(6, 41, 28);
+ }
return jjMoveStringLiteralDfa7_0(active0, 0x20000080000000L);
case 108:
return jjMoveStringLiteralDfa7_0(active0, 0x200000000000000L);
case 110:
- if ((active0 & 0x400L) != 0L)
+ if ((active0 & 0x400L) != 0L) {
return jjStartNfaWithStates_0(6, 10, 28);
+ }
break;
case 111:
return jjMoveStringLiteralDfa7_0(active0, 0x2000000000000L);
case 115:
- if ((active0 & 0x800000L) != 0L)
+ if ((active0 & 0x800000L) != 0L) {
return jjStartNfaWithStates_0(6, 23, 28);
+ }
break;
case 116:
- if ((active0 & 0x80000L) != 0L)
+ if ((active0 & 0x80000L) != 0L) {
return jjStartNfaWithStates_0(6, 19, 28);
+ }
return jjMoveStringLiteralDfa7_0(active0, 0x40000000000L);
case 117:
return jjMoveStringLiteralDfa7_0(active0, 0x40000L);
case 121:
- if ((active0 & 0x4000000L) != 0L)
+ if ((active0 & 0x4000000L) != 0L) {
return jjStartNfaWithStates_0(6, 26, 28);
+ }
break;
default :
break;
@@ -711,8 +758,9 @@
}
private final int jjMoveStringLiteralDfa7_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(5, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(6, active0, 0L);
@@ -723,16 +771,18 @@
case 99:
return jjMoveStringLiteralDfa8_0(active0, 0x800000000L);
case 101:
- if ((active0 & 0x40000L) != 0L)
+ if ((active0 & 0x40000L) != 0L) {
return jjStartNfaWithStates_0(7, 18, 28);
- else if ((active0 & 0x200000000000000L) != 0L)
+ } else if ((active0 & 0x200000000000000L) != 0L) {
return jjStartNfaWithStates_0(7, 57, 28);
+ }
return jjMoveStringLiteralDfa8_0(active0, 0x40200000000L);
case 110:
return jjMoveStringLiteralDfa8_0(active0, 0x22000080000000L);
case 116:
- if ((active0 & 0x200L) != 0L)
+ if ((active0 & 0x200L) != 0L) {
return jjStartNfaWithStates_0(7, 9, 28);
+ }
break;
default :
break;
@@ -741,8 +791,9 @@
}
private final int jjMoveStringLiteralDfa8_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(6, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(7, active0, 0L);
@@ -751,20 +802,23 @@
switch(curChar)
{
case 100:
- if ((active0 & 0x40000000000L) != 0L)
+ if ((active0 & 0x40000000000L) != 0L) {
return jjStartNfaWithStates_0(8, 42, 28);
+ }
break;
case 101:
- if ((active0 & 0x800000000L) != 0L)
+ if ((active0 & 0x800000000L) != 0L) {
return jjStartNfaWithStates_0(8, 35, 28);
+ }
break;
case 105:
return jjMoveStringLiteralDfa9_0(active0, 0x2000000000000L);
case 111:
return jjMoveStringLiteralDfa9_0(active0, 0x200000000L);
case 116:
- if ((active0 & 0x20000000000000L) != 0L)
+ if ((active0 & 0x20000000000000L) != 0L) {
return jjStartNfaWithStates_0(8, 53, 28);
+ }
return jjMoveStringLiteralDfa9_0(active0, 0x80000000L);
default :
break;
@@ -773,8 +827,9 @@
}
private final int jjMoveStringLiteralDfa9_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(7, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(8, active0, 0L);
@@ -783,12 +838,14 @@
switch(curChar)
{
case 102:
- if ((active0 & 0x200000000L) != 0L)
+ if ((active0 & 0x200000000L) != 0L) {
return jjStartNfaWithStates_0(9, 33, 28);
+ }
break;
case 115:
- if ((active0 & 0x80000000L) != 0L)
+ if ((active0 & 0x80000000L) != 0L) {
return jjStartNfaWithStates_0(9, 31, 28);
+ }
break;
case 122:
return jjMoveStringLiteralDfa10_0(active0, 0x2000000000000L);
@@ -799,8 +856,9 @@
}
private final int jjMoveStringLiteralDfa10_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(8, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(9, active0, 0L);
@@ -817,8 +875,9 @@
}
private final int jjMoveStringLiteralDfa11_0(long old0, long active0)
{
- if (((active0 &= old0)) == 0L)
+ if (((active0 &= old0)) == 0L) {
return jjStartNfa_0(9, old0, 0L);
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) {
jjStopStringLiteralDfa_0(10, active0, 0L);
@@ -827,8 +886,9 @@
switch(curChar)
{
case 100:
- if ((active0 & 0x2000000000000L) != 0L)
+ if ((active0 & 0x2000000000000L) != 0L) {
return jjStartNfaWithStates_0(11, 49, 28);
+ }
break;
default :
break;
@@ -891,320 +951,395 @@
};
private final int jjMoveNfa_0(int startState, int curPos)
{
- int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 67;
int i = 1;
jjstateSet[0] = startState;
- int j, kind = 0x7fffffff;
+ int kind = 0x7fffffff;
for (;;)
{
- if (++jjround == 0x7fffffff)
+ if (++jjround == 0x7fffffff) {
ReInitRounds();
+ }
if (curChar < 64)
{
long l = 1L << curChar;
- MatchLoop: do
+ //MatchLoop
+ do
{
switch(jjstateSet[--i])
{
case 0:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddStates(0, 6);
- else if (curChar == 47)
+ } else if (curChar == 47) {
jjAddStates(7, 9);
- else if (curChar == 36)
+ } else if (curChar == 36)
{
- if (kind > 67)
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
}
- else if (curChar == 34)
+ else if (curChar == 34) {
jjCheckNAddStates(10, 12);
- else if (curChar == 39)
+ } else if (curChar == 39) {
jjAddStates(13, 14);
- else if (curChar == 46)
+ } else if (curChar == 46) {
jjCheckNAdd(4);
+ }
if ((0x3fe000000000000L & l) != 0L)
{
- if (kind > 59)
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(1, 2);
}
else if (curChar == 48)
{
- if (kind > 59)
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddStates(15, 17);
}
break;
case 49:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddTwoStates(62, 63);
- else if (curChar == 47)
+ } else if (curChar == 47) {
jjCheckNAddStates(18, 20);
- if (curChar == 42)
+ }
+ if (curChar == 42) {
jjstateSet[jjnewStateCnt++] = 54;
+ }
break;
case 1:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(1, 2);
break;
case 3:
- if (curChar == 46)
+ if (curChar == 46) {
jjCheckNAdd(4);
+ }
break;
case 4:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddStates(21, 23);
break;
case 6:
- if ((0x280000000000L & l) != 0L)
+ if ((0x280000000000L & l) != 0L) {
jjCheckNAdd(7);
+ }
break;
case 7:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddTwoStates(7, 8);
break;
case 9:
- if (curChar == 39)
+ if (curChar == 39) {
jjAddStates(13, 14);
+ }
break;
case 10:
- if ((0xffffff7fffffdbffL & l) != 0L)
+ if ((0xffffff7fffffdbffL & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 11:
- if (curChar == 39 && kind > 65)
+ if (curChar == 39 && kind > 65) {
kind = 65;
+ }
break;
case 13:
- if ((0x8400000000L & l) != 0L)
+ if ((0x8400000000L & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 14:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAddTwoStates(15, 11);
+ }
break;
case 15:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 16:
- if ((0xf000000000000L & l) != 0L)
+ if ((0xf000000000000L & l) != 0L) {
jjstateSet[jjnewStateCnt++] = 17;
+ }
break;
case 17:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAdd(15);
+ }
break;
case 18:
- if (curChar == 34)
+ if (curChar == 34) {
jjCheckNAddStates(10, 12);
+ }
break;
case 19:
- if ((0xfffffffbffffdbffL & l) != 0L)
+ if ((0xfffffffbffffdbffL & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 21:
- if ((0x8400000000L & l) != 0L)
+ if ((0x8400000000L & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 22:
- if (curChar == 34 && kind > 66)
+ if (curChar == 34 && kind > 66) {
kind = 66;
+ }
break;
case 23:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAddStates(24, 27);
+ }
break;
case 24:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 25:
- if ((0xf000000000000L & l) != 0L)
+ if ((0xf000000000000L & l) != 0L) {
jjstateSet[jjnewStateCnt++] = 26;
+ }
break;
case 26:
- if ((0xff000000000000L & l) != 0L)
+ if ((0xff000000000000L & l) != 0L) {
jjCheckNAdd(24);
+ }
break;
case 27:
- if (curChar != 36)
+ if (curChar != 36) {
break;
- if (kind > 67)
+ }
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
break;
case 28:
- if ((0x3ff001000000000L & l) == 0L)
+ if ((0x3ff001000000000L & l) == 0L) {
break;
- if (kind > 67)
+ }
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
break;
case 29:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddStates(0, 6);
+ }
break;
case 30:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddTwoStates(30, 31);
+ }
break;
case 31:
- if (curChar != 46)
+ if (curChar != 46) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddStates(28, 30);
break;
case 32:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddStates(28, 30);
break;
case 34:
- if ((0x280000000000L & l) != 0L)
+ if ((0x280000000000L & l) != 0L) {
jjCheckNAdd(35);
+ }
break;
case 35:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddTwoStates(35, 8);
break;
case 36:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddTwoStates(36, 37);
+ }
break;
case 38:
- if ((0x280000000000L & l) != 0L)
+ if ((0x280000000000L & l) != 0L) {
jjCheckNAdd(39);
+ }
break;
case 39:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 63)
+ }
+ if (kind > 63) {
kind = 63;
+ }
jjCheckNAddTwoStates(39, 8);
break;
case 40:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddStates(31, 33);
+ }
break;
case 42:
- if ((0x280000000000L & l) != 0L)
+ if ((0x280000000000L & l) != 0L) {
jjCheckNAdd(43);
+ }
break;
case 43:
- if ((0x3ff000000000000L & l) != 0L)
+ if ((0x3ff000000000000L & l) != 0L) {
jjCheckNAddTwoStates(43, 8);
+ }
break;
case 44:
- if (curChar != 48)
+ if (curChar != 48) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddStates(15, 17);
break;
case 46:
- if ((0x3ff000000000000L & l) == 0L)
+ if ((0x3ff000000000000L & l) == 0L) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(46, 2);
break;
case 47:
- if ((0xff000000000000L & l) == 0L)
+ if ((0xff000000000000L & l) == 0L) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(47, 2);
break;
case 48:
- if (curChar == 47)
+ if (curChar == 47) {
jjAddStates(7, 9);
+ }
break;
case 50:
- if ((0xffffffffffffdbffL & l) != 0L)
+ if ((0xffffffffffffdbffL & l) != 0L) {
jjCheckNAddStates(18, 20);
+ }
break;
case 51:
- if ((0x2400L & l) != 0L && kind > 6)
+ if ((0x2400L & l) != 0L && kind > 6) {
kind = 6;
+ }
break;
case 52:
- if (curChar == 10 && kind > 6)
+ if (curChar == 10 && kind > 6) {
kind = 6;
+ }
break;
case 53:
- if (curChar == 13)
+ if (curChar == 13) {
jjstateSet[jjnewStateCnt++] = 52;
+ }
break;
case 54:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddTwoStates(55, 56);
+ }
break;
case 55:
- if ((0xfffffbffffffffffL & l) != 0L)
+ if ((0xfffffbffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(55, 56);
+ }
break;
case 56:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddStates(34, 36);
+ }
break;
case 57:
- if ((0xffff7bffffffffffL & l) != 0L)
+ if ((0xffff7bffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(58, 56);
+ }
break;
case 58:
- if ((0xfffffbffffffffffL & l) != 0L)
+ if ((0xfffffbffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(58, 56);
+ }
break;
case 59:
- if (curChar == 47 && kind > 7)
+ if (curChar == 47 && kind > 7) {
kind = 7;
+ }
break;
case 60:
- if (curChar == 42)
+ if (curChar == 42) {
jjstateSet[jjnewStateCnt++] = 54;
+ }
break;
case 61:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddTwoStates(62, 63);
+ }
break;
case 62:
- if ((0xfffffbffffffffffL & l) != 0L)
+ if ((0xfffffbffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(62, 63);
+ }
break;
case 63:
- if (curChar == 42)
+ if (curChar == 42) {
jjCheckNAddStates(37, 39);
+ }
break;
case 64:
- if ((0xffff7bffffffffffL & l) != 0L)
+ if ((0xffff7bffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(65, 63);
+ }
break;
case 65:
- if ((0xfffffbffffffffffL & l) != 0L)
+ if ((0xfffffbffffffffffL & l) != 0L) {
jjCheckNAddTwoStates(65, 63);
+ }
break;
case 66:
- if (curChar == 47 && kind > 8)
+ if (curChar == 47 && kind > 8) {
kind = 8;
+ }
break;
default : break;
}
@@ -1213,75 +1348,93 @@
else if (curChar < 128)
{
long l = 1L << (curChar & 077);
- MatchLoop: do
+ //MatchLoop
+ do
{
switch(jjstateSet[--i])
{
case 0:
case 28:
- if ((0x7fffffe87fffffeL & l) == 0L)
+ if ((0x7fffffe87fffffeL & l) == 0L) {
break;
- if (kind > 67)
+ }
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
break;
case 2:
- if ((0x100000001000L & l) != 0L && kind > 59)
+ if ((0x100000001000L & l) != 0L && kind > 59) {
kind = 59;
+ }
break;
case 5:
- if ((0x2000000020L & l) != 0L)
+ if ((0x2000000020L & l) != 0L) {
jjAddStates(40, 41);
+ }
break;
case 8:
- if ((0x5000000050L & l) != 0L && kind > 63)
+ if ((0x5000000050L & l) != 0L && kind > 63) {
kind = 63;
+ }
break;
case 10:
- if ((0xffffffffefffffffL & l) != 0L)
+ if ((0xffffffffefffffffL & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 12:
- if (curChar == 92)
+ if (curChar == 92) {
jjAddStates(42, 44);
+ }
break;
case 13:
- if ((0x14404410000000L & l) != 0L)
+ if ((0x14404410000000L & l) != 0L) {
jjCheckNAdd(11);
+ }
break;
case 19:
- if ((0xffffffffefffffffL & l) != 0L)
+ if ((0xffffffffefffffffL & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 20:
- if (curChar == 92)
+ if (curChar == 92) {
jjAddStates(45, 47);
+ }
break;
case 21:
- if ((0x14404410000000L & l) != 0L)
+ if ((0x14404410000000L & l) != 0L) {
jjCheckNAddStates(10, 12);
+ }
break;
case 33:
- if ((0x2000000020L & l) != 0L)
+ if ((0x2000000020L & l) != 0L) {
jjAddStates(48, 49);
+ }
break;
case 37:
- if ((0x2000000020L & l) != 0L)
+ if ((0x2000000020L & l) != 0L) {
jjAddStates(50, 51);
+ }
break;
case 41:
- if ((0x2000000020L & l) != 0L)
+ if ((0x2000000020L & l) != 0L) {
jjAddStates(52, 53);
+ }
break;
case 45:
- if ((0x100000001000000L & l) != 0L)
+ if ((0x100000001000000L & l) != 0L) {
jjCheckNAdd(46);
+ }
break;
case 46:
- if ((0x7e0000007eL & l) == 0L)
+ if ((0x7e0000007eL & l) == 0L) {
break;
- if (kind > 59)
+ }
+ if (kind > 59) {
kind = 59;
+ }
jjCheckNAddTwoStates(46, 2);
break;
case 50:
@@ -1312,47 +1465,57 @@
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
long l2 = 1L << (curChar & 077);
- MatchLoop: do
+ //MatchLoop
+ do
{
switch(jjstateSet[--i])
{
case 0:
case 28:
- if (!jjCanMove_1(hiByte, i1, i2, l1, l2))
+ if (!jjCanMove_1(hiByte, i1, i2, l1, l2)) {
break;
- if (kind > 67)
+ }
+ if (kind > 67) {
kind = 67;
+ }
jjCheckNAdd(28);
break;
case 10:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjstateSet[jjnewStateCnt++] = 11;
+ }
break;
case 19:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjAddStates(10, 12);
+ }
break;
case 50:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjAddStates(18, 20);
+ }
break;
case 55:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjCheckNAddTwoStates(55, 56);
+ }
break;
case 57:
case 58:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjCheckNAddTwoStates(58, 56);
+ }
break;
case 62:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjCheckNAddTwoStates(62, 63);
+ }
break;
case 64:
case 65:
- if (jjCanMove_0(hiByte, i1, i2, l1, l2))
+ if (jjCanMove_0(hiByte, i1, i2, l1, l2)) {
jjCheckNAddTwoStates(65, 63);
+ }
break;
default : break;
}
@@ -1365,8 +1528,9 @@
kind = 0x7fffffff;
}
++curPos;
- if ((i = jjnewStateCnt) == (startsAt = 67 - (jjnewStateCnt = startsAt)))
+ if ((i = jjnewStateCnt) == (startsAt = 67 - (jjnewStateCnt = startsAt))) {
return curPos;
+ }
try { curChar = input_stream.readChar(); }
catch(java.io.IOException e) { return curPos; }
}
@@ -1384,8 +1548,9 @@
case 0:
return ((jjbitVec2[i2] & l2) != 0L);
default :
- if ((jjbitVec0[i1] & l1) != 0L)
+ if ((jjbitVec0[i1] & l1) != 0L) {
return true;
+ }
return false;
}
}
@@ -1404,8 +1569,9 @@
case 61:
return ((jjbitVec8[i2] & l2) != 0L);
default :
- if ((jjbitVec3[i1] & l1) != 0L)
+ if ((jjbitVec3[i1] & l1) != 0L) {
return true;
+ }
return false;
}
}
@@ -1449,8 +1615,9 @@
protected char curChar;
public ExpressionParserTokenManager(ASCII_UCodeESC_CharStream stream)
{
- if (ASCII_UCodeESC_CharStream.staticFlag)
+ if (ASCII_UCodeESC_CharStream.staticFlag) {
throw new Error("ERROR: Cannot use a static CharStream class with a non-static lexical analyzer.");
+ }
input_stream = stream;
}
public ExpressionParserTokenManager(ASCII_UCodeESC_CharStream stream, int lexState)
@@ -1469,9 +1636,10 @@
{
int i;
jjround = 0x80000001;
- for (i = 67; i-- > 0;)
+ for (i = 67; i-- > 0;) {
jjrounds[i] = 0x80000000;
}
+}
public void ReInit(ASCII_UCodeESC_CharStream stream, int lexState)
{
ReInit(stream);
@@ -1479,11 +1647,12 @@
}
public void SwitchTo(int lexState)
{
- if (lexState >= 1 || lexState < 0)
+ if (lexState >= 1 || lexState < 0) {
throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
- else
+ } else {
curLexState = lexState;
}
+}
private final Token jjFillToken()
{
@@ -1507,7 +1676,6 @@
public final Token getNextToken()
{
- int kind;
Token specialToken = null;
Token matchedToken;
int curPos = 0;
@@ -1528,17 +1696,19 @@
}
try {
- while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L)
+ while (curChar <= 32 && (0x100003600L & (1L << curChar)) != 0L) {
curChar = input_stream.BeginToken();
}
+ }
catch (java.io.IOException e1) { continue EOFLoop; }
jjmatchedKind = 0x7fffffff;
jjmatchedPos = 0;
curPos = jjMoveStringLiteralDfa0_0();
if (jjmatchedKind != 0x7fffffff)
{
- if (jjmatchedPos + 1 < curPos)
+ if (jjmatchedPos + 1 < curPos) {
input_stream.backup(curPos - jjmatchedPos - 1);
+ }
if ((jjtoToken[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
{
matchedToken = jjFillToken();
@@ -1550,9 +1720,9 @@
if ((jjtoSpecial[jjmatchedKind >> 6] & (1L << (jjmatchedKind & 077))) != 0L)
{
matchedToken = jjFillToken();
- if (specialToken == null)
+ if (specialToken == null) {
specialToken = matchedToken;
- else
+ } else
{
matchedToken.specialToken = specialToken;
specialToken = (specialToken.next = matchedToken);
@@ -1572,9 +1742,9 @@
if (curChar == '\n' || curChar == '\r') {
error_line++;
error_column = 0;
+ } else {
+ error_column++;
}
- else
- error_column++;
}
if (!EOFSeen) {
input_stream.backup(1);
--- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/LValue.java Wed Apr 27 20:24:30 2011 +0100
@@ -156,6 +156,7 @@
return new LValueArrayElement(interiorGetValue(), index);
}
+ @Override
public String toString() {
try {
return interiorGetValue().toString();
@@ -419,6 +420,7 @@
this.var = var;
}
+ @Override
Value getValue() {
if (jdiValue == null) {
jdiValue = frame.getValue(var);
@@ -426,12 +428,14 @@
return jdiValue;
}
+ @Override
void setValue0(Value val) throws InvalidTypeException,
ClassNotLoadedException {
frame.setValue(var, val);
jdiValue = val;
}
+ @Override
void invokeWith(List<Value> arguments) throws ParseException {
throw new ParseException(var.name() + " is not a method");
}
@@ -469,6 +473,7 @@
}
}
+ @Override
Value getValue() throws InvocationException, InvalidTypeException,
ClassNotLoadedException, IncompatibleThreadStateException,
ParseException {
@@ -485,6 +490,7 @@
}
}
+ @Override
void setValue0(Value val) throws ParseException,
InvalidTypeException,
ClassNotLoadedException {
@@ -495,6 +501,7 @@
jdiValue = val;
}
+ @Override
void invokeWith(List<Value> arguments) throws ParseException {
if (matchingMethod != null) {
throw new ParseException("Invalid consecutive invocations");
@@ -531,6 +538,7 @@
}
}
+ @Override
Value getValue() throws InvocationException, InvalidTypeException,
ClassNotLoadedException, IncompatibleThreadStateException,
ParseException {
@@ -548,6 +556,7 @@
}
}
+ @Override
void setValue0(Value val)
throws ParseException, InvalidTypeException,
ClassNotLoadedException {
@@ -562,6 +571,7 @@
jdiValue = val;
}
+ @Override
void invokeWith(List<Value> arguments) throws ParseException {
if (matchingMethod != null) {
throw new ParseException("Invalid consecutive invocations");
@@ -589,6 +599,7 @@
this.arrayRef = value;
}
+ @Override
Value getValue() {
if (jdiValue == null) {
jdiValue = arrayRef.virtualMachine().mirrorOf(arrayRef.length());
@@ -596,10 +607,12 @@
return jdiValue;
}
+ @Override
void setValue0(Value value) throws ParseException {
throw new ParseException("Cannot set constant: " + value);
}
+ @Override
void invokeWith(List<Value> arguments) throws ParseException {
throw new ParseException("Array element is not a method");
}
@@ -618,6 +631,7 @@
this.index = index;
}
+ @Override
Value getValue() {
if (jdiValue == null) {
jdiValue = array.getValue(index);
@@ -625,12 +639,14 @@
return jdiValue;
}
+ @Override
void setValue0(Value val) throws InvalidTypeException,
ClassNotLoadedException {
array.setValue(index, val);
jdiValue = val;
}
+ @Override
void invokeWith(List<Value> arguments) throws ParseException {
throw new ParseException("Array element is not a method");
}
@@ -643,6 +659,7 @@
this.value = value;
}
+ @Override
Value getValue() {
if (jdiValue == null) {
jdiValue = value;
@@ -650,10 +667,12 @@
return jdiValue;
}
+ @Override
void setValue0(Value val) throws ParseException {
throw new ParseException("Cannot set constant: " + value);
}
+ @Override
void invokeWith(List<Value> arguments) throws ParseException {
throw new ParseException("Constant is not a method");
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/ParseException.java Wed Apr 27 20:24:30 2011 +0100
@@ -37,6 +37,8 @@
*/
public class ParseException extends Exception {
+ private static final long serialVersionUID = 7978489144303647901L;
+
/**
* This constructor is used by the method "generateParseException"
* in the generated parser. Calling this constructor generates
@@ -119,20 +121,21 @@
* of the final stack trace, and hence the correct error message
* gets displayed.
*/
+ @Override
public String getMessage() {
if (!specialConstructor) {
return super.getMessage();
}
String expected = "";
int maxSize = 0;
- for (int i = 0; i < expectedTokenSequences.length; i++) {
- if (maxSize < expectedTokenSequences[i].length) {
- maxSize = expectedTokenSequences[i].length;
+ for (int[] expectedTokenSequence : expectedTokenSequences) {
+ if (maxSize < expectedTokenSequence.length) {
+ maxSize = expectedTokenSequence.length;
}
- for (int j = 0; j < expectedTokenSequences[i].length; j++) {
- expected += tokenImage[expectedTokenSequences[i][j]] + " ";
+ for (int j = 0; j < expectedTokenSequence.length; j++) {
+ expected += tokenImage[expectedTokenSequence[j]] + " ";
}
- if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
+ if (expectedTokenSequence[expectedTokenSequence.length - 1] != 0) {
expected += "...";
}
expected += eol + " ";
@@ -140,7 +143,9 @@
String retval = "Encountered \"";
Token tok = currentToken.next;
for (int i = 0; i < maxSize; i++) {
- if (i != 0) retval += " ";
+ if (i != 0) {
+ retval += " ";
+ }
if (tok.kind == 0) {
retval += tokenImage[0];
break;
--- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/Token.java Wed Apr 27 20:24:30 2011 +0100
@@ -78,6 +78,7 @@
/**
* Returns the image.
*/
+ @Override
public final String toString()
{
return image;
--- a/jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/expr/TokenMgrError.java Wed Apr 27 20:24:30 2011 +0100
@@ -32,6 +32,8 @@
* Ordinals for various reasons why an Error of this type can be thrown.
*/
+ private static final long serialVersionUID = -6236440836177601522L;
+
/**
* Lexical error occured.
*/
@@ -136,6 +138,7 @@
*
* from this method for such cases in the release version of your parser.
*/
+ @Override
public String getMessage() {
return super.getMessage();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ApplicationTool.java Wed Apr 27 20:24:30 2011 +0100
@@ -29,12 +29,12 @@
import java.awt.*;
import java.awt.event.*;
-import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
public class ApplicationTool extends JPanel {
- private Environment env;
+ private static final long serialVersionUID = 310966063293205714L;
+
private ExecutionManager runtime;
private TypeScript script;
@@ -45,13 +45,13 @@
super(new BorderLayout());
- this.env = env;
this.runtime = env.getExecutionManager();
this.script = new TypeScript(PROMPT, false); // No implicit echo.
this.add(script);
script.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
runtime.sendLineToApplication(script.readln());
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ClassTreeTool.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,12 +25,10 @@
package com.sun.tools.example.debug.gui;
-import java.io.*;
import java.util.*;
import javax.swing.*;
import javax.swing.tree.*;
-import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
@@ -40,6 +38,8 @@
public class ClassTreeTool extends JPanel {
+ private static final long serialVersionUID = 526178912591739259L;
+
private Environment env;
private ExecutionManager runtime;
@@ -49,7 +49,7 @@
private JTree tree;
private DefaultTreeModel treeModel;
private ClassTreeNode root;
- private SearchPath sourcePath;
+// private SearchPath sourcePath;
private CommandInterpreter interpreter;
@@ -87,6 +87,7 @@
******/
MouseListener ml = new MouseAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
int selRow = tree.getRowForLocation(e.getX(), e.getY());
TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
@@ -121,6 +122,7 @@
// SessionListener
+ @Override
public void sessionStart(EventObject e) {
// Get system classes and any others loaded before attaching.
try {
@@ -134,19 +136,24 @@
}
}
+ @Override
public void sessionInterrupt(EventObject e) {}
+ @Override
public void sessionContinue(EventObject e) {}
// JDIListener
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
root.addClass(e.getReferenceType());
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
root.removeClass(e.getClassName());
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
// Clear contents of this view.
root = createClassTree(HEADING);
@@ -169,6 +176,7 @@
this.refTy = refTy;
}
+ @Override
public String toString() {
return name;
}
@@ -185,6 +193,7 @@
return (refTy == null);
}
+ @Override
public boolean isLeaf() {
return !isPackage();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandInterpreter.java Wed Apr 27 20:24:30 2011 +0100
@@ -29,8 +29,6 @@
import java.util.*;
import com.sun.jdi.*;
-import com.sun.jdi.request.*;
-
import com.sun.tools.example.debug.bdi.*;
public class CommandInterpreter {
@@ -93,9 +91,9 @@
try {
ThreadReference[] threads = threads();
long threadID = Long.parseLong(id, 16);
- for (int i = 0; i < threads.length; i++) {
- if (threads[i].uniqueID() == threadID) {
- thread = threads[i];
+ for (ThreadReference thread2 : threads) {
+ if (thread2.uniqueID() == threadID) {
+ thread = thread2;
break;
}
}
@@ -239,16 +237,18 @@
for (int i = 0 ; i < tlist.size() ; i++) {
ThreadReference thr = tlist.get(i);
int len = Utils.description(thr).length();
- if (len > maxId)
+ if (len > maxId) {
maxId = len;
+ }
String name = thr.name();
int iDot = name.lastIndexOf('.');
if (iDot >= 0 && name.length() > iDot) {
name = name.substring(iDot + 1);
}
- if (name.length() > maxName)
+ if (name.length() > maxName) {
maxName = name.length();
}
+ }
String maxNumString = String.valueOf(iThread + tlist.size());
int maxNumDigits = maxNumString.length();
for (int i = 0 ; i < tlist.size() ; i++) {
@@ -616,7 +616,6 @@
int cnt = 1;
if (t.hasMoreTokens()) {
String idToken = t.nextToken();
- int n;
try {
cnt = Integer.valueOf(idToken).intValue();
} catch (NumberFormatException e) {
@@ -885,7 +884,6 @@
}
private void commandStop(StringTokenizer t) throws NoSessionException {
- Location bploc;
String token;
if (!t.hasMoreTokens()) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CommandTool.java Wed Apr 27 20:24:30 2011 +0100
@@ -40,6 +40,8 @@
public class CommandTool extends JPanel {
+ private static final long serialVersionUID = 8613516856378346415L;
+
private Environment env;
private ContextManager context;
@@ -68,6 +70,7 @@
// Establish handler for incoming commands.
script.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
interpreter.executeCommand(script.readln());
}
@@ -107,15 +110,17 @@
// JDIListener
+ @Override
public void accessWatchpoint(AccessWatchpointEventSet e) {
setThread(e);
for (EventIterator it = e.eventIterator(); it.hasNext(); ) {
- Event evt = it.nextEvent();
+ it.nextEvent();
diagnostics.putString("Watchpoint hit: " +
locationString(e));
}
}
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
if (context.getVerboseFlag()) {
String name = e.getReferenceType().name();
@@ -123,6 +128,7 @@
}
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
if (context.getVerboseFlag()) {
diagnostics.putString("Class " + e.getClassName() +
@@ -130,12 +136,14 @@
}
}
+ @Override
public void exception(ExceptionEventSet e) {
setThread(e);
String name = e.getException().referenceType().name();
diagnostics.putString("Exception: " + name);
}
+ @Override
public void locationTrigger(LocationTriggerEventSet e) {
String locString = locationString(e);
setThread(e);
@@ -155,15 +163,17 @@
}
}
+ @Override
public void modificationWatchpoint(ModificationWatchpointEventSet e) {
setThread(e);
for (EventIterator it = e.eventIterator(); it.hasNext(); ) {
- Event evt = it.nextEvent();
+ it.nextEvent();
diagnostics.putString("Watchpoint hit: " +
locationString(e));
}
}
+ @Override
public void threadDeath(ThreadDeathEventSet e) {
if (context.getVerboseFlag()) {
diagnostics.putString("Thread " + e.getThread() +
@@ -171,6 +181,7 @@
}
}
+ @Override
public void threadStart(ThreadStartEventSet e) {
if (context.getVerboseFlag()) {
diagnostics.putString("Thread " + e.getThread() +
@@ -178,16 +189,19 @@
}
}
+ @Override
public void vmDeath(VMDeathEventSet e) {
script.setPrompt(DEFAULT_CMD_PROMPT);
diagnostics.putString("VM exited");
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
script.setPrompt(DEFAULT_CMD_PROMPT);
diagnostics.putString("Disconnected from VM");
}
+ @Override
public void vmStart(VMStartEventSet e) {
script.setPrompt(DEFAULT_CMD_PROMPT);
diagnostics.putString("VM started");
@@ -195,14 +209,17 @@
// SessionListener
+ @Override
public void sessionStart(EventObject e) {}
+ @Override
public void sessionInterrupt(EventObject e) {
Thread.yield(); // fetch output
diagnostics.putString("VM interrupted by user.");
script.setPrompt(DEFAULT_CMD_PROMPT);
}
+ @Override
public void sessionContinue(EventObject e) {
diagnostics.putString("Execution resumed.");
script.setPrompt(DEFAULT_CMD_PROMPT);
@@ -210,23 +227,28 @@
// SpecListener
+ @Override
public void breakpointSet(SpecEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Breakpoint set at " + spec + ".");
}
+ @Override
public void breakpointDeferred(SpecEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Breakpoint will be set at " +
spec + " when its class is loaded.");
}
+ @Override
public void breakpointDeleted(SpecEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Breakpoint at " + spec.toString() + " deleted.");
}
+ @Override
public void breakpointResolved(SpecEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Breakpoint resolved to " + spec.toString() + ".");
}
+ @Override
public void breakpointError(SpecErrorEvent e) {
EventRequestSpec spec = e.getEventRequestSpec();
diagnostics.putString("Deferred breakpoint at " +
@@ -236,25 +258,35 @@
//### Add info for watchpoints and exceptions
+ @Override
public void watchpointSet(SpecEvent e) {
}
+ @Override
public void watchpointDeferred(SpecEvent e) {
}
+ @Override
public void watchpointDeleted(SpecEvent e) {
}
+ @Override
public void watchpointResolved(SpecEvent e) {
}
+ @Override
public void watchpointError(SpecErrorEvent e) {
}
+ @Override
public void exceptionInterceptSet(SpecEvent e) {
}
+ @Override
public void exceptionInterceptDeferred(SpecEvent e) {
}
+ @Override
public void exceptionInterceptDeleted(SpecEvent e) {
}
+ @Override
public void exceptionInterceptResolved(SpecEvent e) {
}
+ @Override
public void exceptionInterceptError(SpecErrorEvent e) {
}
@@ -263,6 +295,7 @@
// If the user selects a new current thread or frame, update prompt.
+ @Override
public void currentFrameChanged(CurrentFrameChangedEvent e) {
// Update prompt only if affect thread is current.
ThreadReference thread = e.getThread();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ContextManager.java Wed Apr 27 20:24:30 2011 +0100
@@ -46,7 +46,7 @@
private boolean verbose;
- private Vector<ContextListener> contextListeners = new Vector<ContextListener>();
+ private ArrayList<ContextListener> contextListeners = new ArrayList<ContextListener>();
public ContextManager(Environment env) {
classManager = env.getClassManager();
@@ -264,11 +264,11 @@
private void notifyCurrentFrameChanged(ThreadInfo tinfo, int index,
boolean invalidate) {
- Vector l = (Vector)contextListeners.clone();
+ ArrayList<ContextListener> l = new ArrayList<ContextListener>(contextListeners);
CurrentFrameChangedEvent evt =
new CurrentFrameChangedEvent(this, tinfo, index, invalidate);
for (int i = 0; i < l.size(); i++) {
- ((ContextListener)l.elementAt(i)).currentFrameChanged(evt);
+ l.get(i).currentFrameChanged(evt);
}
}
@@ -277,28 +277,34 @@
// SessionListener
+ @Override
public void sessionStart(EventObject e) {
invalidateCurrentThread();
}
+ @Override
public void sessionInterrupt(EventObject e) {
setCurrentThreadInvalidate(currentThread);
}
+ @Override
public void sessionContinue(EventObject e) {
invalidateCurrentThread();
}
// JDIListener
+ @Override
public void locationTrigger(LocationTriggerEventSet e) {
setCurrentThreadInvalidate(e.getThread());
}
+ @Override
public void exception(ExceptionEventSet e) {
setCurrentThreadInvalidate(e.getThread());
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
invalidateCurrentThread();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/CurrentFrameChangedEvent.java Wed Apr 27 20:24:30 2011 +0100
@@ -31,6 +31,7 @@
public class CurrentFrameChangedEvent extends EventObject {
+ private static final long serialVersionUID = 4214479486546762179L;
private ThreadInfo tinfo;
private int index;
private boolean invalidate;
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/Environment.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,8 +26,6 @@
package com.sun.tools.example.debug.gui;
import java.io.*;
-import java.util.*;
-
import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/GUI.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,8 +26,6 @@
package com.sun.tools.example.debug.gui;
import java.io.*;
-import java.util.*;
-
import javax.swing.*;
import javax.swing.border.*;
import java.awt.*;
@@ -38,6 +36,7 @@
public class GUI extends JPanel {
+ private static final long serialVersionUID = 3292463234530679091L;
private CommandTool cmdTool;
private ApplicationTool appTool;
//###HACK##
@@ -87,7 +86,7 @@
threadTreeTool = new ThreadTreeTool(env);
threadTreeTool.setPreferredSize(new java.awt.Dimension(200, 450));
- JTabbedPane treePane = new JTabbedPane(JTabbedPane.BOTTOM);
+ JTabbedPane treePane = new JTabbedPane(SwingConstants.BOTTOM);
treePane.addTab("Source", null, sourceTreeTool);
treePane.addTab("Classes", null, classTreeTool);
treePane.addTab("Threads", null, threadTreeTool);
@@ -139,12 +138,9 @@
}
public static void main(String argv[]) {
- String remote = null;
String clsName = "";
String progArgs = "";
String javaArgs = "";
- boolean verbose = false; //### Not implemented.
-
final Environment env = new Environment();
JPanel mainPanel = new GUI(env);
@@ -246,13 +242,14 @@
frame.setContentPane(mainPanel);
frame.addWindowListener(new WindowAdapter() {
+ @Override
public void windowClosing(WindowEvent e) {
env.terminate();
}
});
frame.pack();
- frame.show();
+ frame.setVisible(true);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBFileFilter.java Wed Apr 27 20:24:30 2011 +0100
@@ -28,7 +28,6 @@
import java.io.File;
import java.util.Hashtable;
import java.util.Enumeration;
-import javax.swing.*;
import javax.swing.filechooser.*;
//### Renamed from 'ExampleFileFilter.java' provided with Swing demos.
@@ -93,8 +92,12 @@
*/
public JDBFileFilter(String extension, String description) {
this();
- if(extension!=null) addExtension(extension);
- if(description!=null) setDescription(description);
+ if(extension!=null) {
+ addExtension(extension);
+ }
+ if(description!=null) {
+ setDescription(description);
+ }
}
/**
@@ -120,11 +123,13 @@
*/
public JDBFileFilter(String[] filters, String description) {
this();
- for (int i = 0; i < filters.length; i++) {
+ for (String filter : filters) {
// add filters one by one
- addExtension(filters[i]);
+ addExtension(filter);
}
- if(description!=null) setDescription(description);
+ if(description!=null) {
+ setDescription(description);
+ }
}
/**
@@ -136,6 +141,7 @@
* @see #getExtension
* @see FileFilter#accepts
*/
+ @Override
public boolean accept(File f) {
if(f != null) {
if(f.isDirectory()) {
@@ -196,6 +202,7 @@
* @see isExtensionListInDescription
* @see FileFilter#getDescription
*/
+ @Override
public String getDescription() {
if(fullDescription == null) {
if(description == null || isExtensionListInDescription()) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBMenuBar.java Wed Apr 27 20:24:30 2011 +0100
@@ -31,7 +31,6 @@
import java.util.Vector;
import java.util.List;
-import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
//### This is currently just a placeholder!
@@ -57,6 +56,7 @@
JMenuItem openItem = new JMenuItem("Open...", 'O');
openItem.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
openCommand();
}
@@ -93,6 +93,7 @@
JMenuItem monitorItem = new JMenuItem("Monitor Expression...", 'M');
monitorItem.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
monitorCommand();
}
@@ -101,6 +102,7 @@
JMenuItem unmonitorItem = new JMenuItem("Unmonitor Expression...");
unmonitorItem.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
unmonitorCommand();
}
@@ -110,6 +112,7 @@
JMenu breakpointMenu = new JMenu("Breakpoint");
JMenuItem stopItem = new JMenuItem("Stop in...", 'S');
stopItem.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
buildBreakpoint();
}
@@ -176,6 +179,7 @@
mi.setToolTipText(toolTip);
final String cmd = command;
mi.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
interpreter.executeCommand(cmd);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/JDBToolBar.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,10 +26,8 @@
package com.sun.tools.example.debug.gui;
import javax.swing.*;
-import java.awt.*;
import java.awt.event.*;
-import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
class JDBToolBar extends JToolBar {
@@ -92,6 +90,7 @@
button.setToolTipText(toolTip);
final String cmd = command;
button.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
interpreter.executeCommand(cmd);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/LaunchTool.java Wed Apr 27 20:24:30 2011 +0100
@@ -29,18 +29,10 @@
import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
-import java.util.Iterator;
-
-import java.io.IOException;
-
import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Container;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
import javax.swing.*;
import javax.swing.border.Border;
import javax.swing.border.TitledBorder;
@@ -98,6 +90,7 @@
comp.add(panel);
}
+ @Override
String getText() {
return textField.getText();
}
@@ -114,6 +107,7 @@
comp.add(panel);
}
+ @Override
String getText() {
return ((Connector.BooleanArgument)arg)
.stringValueOf(check.getModel().isSelected());
@@ -147,6 +141,7 @@
final boolean[] oked = {false};
JPanel buttonPanel = okCancel( dialog, new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent event) {
if (radioGroup.getSelection() == null) {
JOptionPane.showMessageDialog(dialog,
@@ -162,7 +157,7 @@
} );
content.add(BorderLayout.SOUTH, buttonPanel);
dialog.pack();
- dialog.show();
+ dialog.setVisible(true);
return oked[0] ?
modelToConnector.get(radioGroup.getSelection()) :
@@ -178,7 +173,7 @@
Container content = dialog.getContentPane();
JPanel guts = new JPanel();
Border etched = BorderFactory.createEtchedBorder();
- Border titled = BorderFactory.createTitledBorder(etched,
+ BorderFactory.createTitledBorder(etched,
connector.description(),
TitledBorder.LEFT, TitledBorder.TOP);
guts.setBorder(etched);
@@ -199,6 +194,7 @@
content.add(guts);
JPanel buttonPanel = okCancel( dialog, new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent event) {
for (ArgRep ar : argReps) {
if (!ar.isSpecified()) {
@@ -236,7 +232,7 @@
} );
content.add(BorderLayout.SOUTH, buttonPanel);
dialog.pack();
- dialog.show();
+ dialog.setVisible(true);
}
private JPanel okCancel(final JDialog dialog, ActionListener okListener) {
@@ -247,6 +243,7 @@
buttonPanel.add(cancel);
ok.addActionListener(okListener);
cancel.addActionListener( new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent event) {
dialog.setVisible(false);
dialog.dispose();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorListModel.java Wed Apr 27 20:24:30 2011 +0100
@@ -42,10 +42,12 @@
//### remove listeners on exit!
}
+ @Override
public Object getElementAt(int index) {
return monitors.get(index);
}
+ @Override
public int getSize() {
return monitors.size();
}
@@ -70,7 +72,7 @@
return Collections.unmodifiableList(monitors);
}
- public Iterator iterator() {
+ public Iterator<?> iterator() {
return monitors().iterator();
}
@@ -80,7 +82,8 @@
private class MonitorListListener implements ContextListener {
- public void currentFrameChanged(CurrentFrameChangedEvent e) {
+ @Override
+ public void currentFrameChanged(final CurrentFrameChangedEvent e) {
invalidate();
}
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/MonitorTool.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,15 +25,9 @@
package com.sun.tools.example.debug.gui;
-import java.io.*;
-import java.util.*;
-
import javax.swing.*;
-import javax.swing.tree.*;
import javax.swing.event.*;
import java.awt.*;
-import java.awt.event.*;
-
import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
import com.sun.tools.example.debug.expr.ExpressionParser;
@@ -41,6 +35,7 @@
public class MonitorTool extends JPanel {
+ private static final long serialVersionUID = -645235951031726647L;
private ExecutionManager runtime;
private ContextManager context;
@@ -64,6 +59,7 @@
}
private class MonitorToolListener implements ListSelectionListener {
+ @Override
public void valueChanged(ListSelectionEvent e) {
int index = list.getSelectedIndex();
if (index != -1) {
@@ -78,6 +74,7 @@
IncompatibleThreadStateException {
ExpressionParser.GetFrame frameGetter =
new ExpressionParser.GetFrame() {
+ @Override
public StackFrame get()
throws IncompatibleThreadStateException
{
@@ -93,6 +90,7 @@
private class MonitorRenderer extends DefaultListCellRenderer {
+ @Override
public Component getListCellRendererComponent(JList list,
Object value,
int index,
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SearchPath.java Wed Apr 27 20:24:30 2011 +0100
@@ -58,8 +58,8 @@
}
public File resolve(String relativeFileName) {
- for (int i = 0; i < pathArray.length; i++) {
- File path = new File(pathArray[i], relativeFileName);
+ for (String element : pathArray) {
+ File path = new File(element, relativeFileName);
if (path.exists()) {
return path;
}
@@ -76,8 +76,8 @@
// classpath is retained. This is the one that will be
// found if we later do a 'resolve'.
SortedSet<String> s = new TreeSet<String>(); // sorted, no duplicates
- for (int i = 0; i < pathArray.length; i++) {
- File path = new File(pathArray[i], relativeDirName);
+ for (String element : pathArray) {
+ File path = new File(element, relativeDirName);
if (path.exists()) {
String[] childArray = path.list(filter);
if (childArray != null) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SingleLeafTreeSelectionModel.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,22 +25,25 @@
package com.sun.tools.example.debug.gui;
-import javax.swing.*;
import javax.swing.tree.*;
public class SingleLeafTreeSelectionModel extends DefaultTreeSelectionModel {
+ private static final long serialVersionUID = -7849105107888117679L;
+
SingleLeafTreeSelectionModel() {
super();
selectionMode = SINGLE_TREE_SELECTION;
}
+ @Override
public void setSelectionPath(TreePath path) {
if(((TreeNode)(path.getLastPathComponent())).isLeaf()) {
super.setSelectionPath(path);
}
}
+ @Override
public void setSelectionPaths(TreePath[] paths) {
// Only look at first path, as all others will be
// ignored anyway in single tree selection mode.
@@ -49,12 +52,14 @@
}
}
+ @Override
public void addSelectionPath(TreePath path) {
if(((TreeNode)(path.getLastPathComponent())).isLeaf()) {
super.setSelectionPath(path);
}
}
+ @Override
public void addSelectionPaths(TreePath[] paths) {
// Only look at first path, as all others will be
// ignored anyway in single tree selection mode.
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceManager.java Wed Apr 27 20:24:30 2011 +0100
@@ -31,7 +31,6 @@
import com.sun.jdi.*;
import com.sun.tools.example.debug.event.*;
-import com.sun.tools.example.debug.bdi.*;
/**
* Manage the list of source files.
@@ -45,7 +44,7 @@
private List<SourceModel> sourceList;
private SearchPath sourcePath;
- private Vector<SourceListener> sourceListeners = new Vector<SourceListener>();
+ private ArrayList<SourceListener> sourceListeners = new ArrayList<SourceListener>();
private Map<ReferenceType, SourceModel> classToSource = new HashMap<ReferenceType, SourceModel>();
@@ -79,18 +78,18 @@
}
public void addSourceListener(SourceListener l) {
- sourceListeners.addElement(l);
+ sourceListeners.add(l);
}
public void removeSourceListener(SourceListener l) {
- sourceListeners.removeElement(l);
+ sourceListeners.remove(l);
}
private void notifySourcepathChanged() {
- Vector l = (Vector)sourceListeners.clone();
+ ArrayList<SourceListener> l = new ArrayList<SourceListener>(sourceListeners);
SourcepathChangedEvent evt = new SourcepathChangedEvent(this);
for (int i = 0; i < l.size(); i++) {
- ((SourceListener)l.elementAt(i)).sourcepathChanged(evt);
+ l.get(i).sourcepathChanged(evt);
}
}
@@ -163,6 +162,7 @@
private class SMClassListener extends JDIAdapter
implements JDIListener {
+ @Override
public void classPrepare(ClassPrepareEventSet e) {
ReferenceType refType = e.getReferenceType();
SourceModel sm = sourceForClass(refType);
@@ -171,6 +171,7 @@
}
}
+ @Override
public void classUnload(ClassUnloadEventSet e) {
//### iterate through looking for (e.getTypeName()).
//### then remove it.
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceModel.java Wed Apr 27 20:24:30 2011 +0100
@@ -31,8 +31,6 @@
import com.sun.jdi.*;
import com.sun.jdi.request.*;
-import com.sun.tools.example.debug.bdi.*;
-
import javax.swing.*;
/**
@@ -101,6 +99,7 @@
// **** Implement ListModel *****
+ @Override
public Object getElementAt(int index) {
if (sourceLines == null) {
initialize();
@@ -108,6 +107,7 @@
return sourceLines.get(index);
}
+ @Override
public int getSize() {
if (sourceLines == null) {
initialize();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTool.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,8 +26,6 @@
package com.sun.tools.example.debug.gui;
import java.io.*;
-import java.util.*;
-
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
@@ -35,12 +33,11 @@
import com.sun.jdi.*;
import com.sun.jdi.request.*;
-import com.sun.tools.example.debug.event.*;
import com.sun.tools.example.debug.bdi.*;
-import java.util.List;
+public class SourceTool extends JPanel {
-public class SourceTool extends JPanel {
+ private static final long serialVersionUID = -5461299294186395257L;
private Environment env;
@@ -99,6 +96,7 @@
// ContextListener
+ @Override
public void currentFrameChanged(CurrentFrameChangedEvent e) {
showSourceContext(e.getThread(), e.getIndex());
}
@@ -108,6 +106,7 @@
// SourceListener
+ @Override
public void sourcepathChanged(SourcepathChangedEvent e) {
// Reload source view if its contents depend
// on the source path.
@@ -120,12 +119,15 @@
// SpecListener
+ @Override
public void breakpointSet(SpecEvent e) {
breakpointResolved(e);
}
+ @Override
public void breakpointDeferred(SpecEvent e) { }
+ @Override
public void breakpointDeleted(SpecEvent e) {
BreakpointRequest req = (BreakpointRequest)e.getEventRequest();
Location loc = req.location();
@@ -139,6 +141,7 @@
}
}
+ @Override
public void breakpointResolved(SpecEvent e) {
BreakpointRequest req = (BreakpointRequest)e.getEventRequest();
Location loc = req.location();
@@ -150,29 +153,40 @@
}
}
+ @Override
public void breakpointError(SpecErrorEvent e) {
breakpointDeleted(e);
}
+ @Override
public void watchpointSet(SpecEvent e) {
}
+ @Override
public void watchpointDeferred(SpecEvent e) {
}
+ @Override
public void watchpointDeleted(SpecEvent e) {
}
+ @Override
public void watchpointResolved(SpecEvent e) {
}
+ @Override
public void watchpointError(SpecErrorEvent e) {
}
+ @Override
public void exceptionInterceptSet(SpecEvent e) {
}
+ @Override
public void exceptionInterceptDeferred(SpecEvent e) {
}
+ @Override
public void exceptionInterceptDeleted(SpecEvent e) {
}
+ @Override
public void exceptionInterceptResolved(SpecEvent e) {
}
+ @Override
public void exceptionInterceptError(SpecErrorEvent e) {
}
}
@@ -269,6 +283,7 @@
private class SourceLineRenderer extends DefaultListCellRenderer {
+ @Override
public Component getListCellRendererComponent(JList list,
Object value,
int index,
@@ -301,6 +316,7 @@
return this;
}
+ @Override
public Dimension getPreferredSize() {
Dimension dim = super.getPreferredSize();
return new Dimension(dim.width, dim.height-5);
@@ -309,6 +325,7 @@
}
private class STMouseListener extends MouseAdapter implements MouseListener {
+ @Override
public void mousePressed(MouseEvent e) {
if (e.isPopupTrigger()) {
showPopupMenu((Component)e.getSource(),
@@ -316,6 +333,7 @@
}
}
+ @Override
public void mouseReleased(MouseEvent e) {
if (e.isPopupTrigger()) {
showPopupMenu((Component)e.getSource(),
@@ -354,6 +372,7 @@
private JMenuItem commandItem(String label, final String cmd) {
JMenuItem item = new JMenuItem(label);
item.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
interpreter.executeCommand(cmd);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourceTreeTool.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,15 +30,15 @@
import javax.swing.*;
import javax.swing.tree.*;
-import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
-import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
public class SourceTreeTool extends JPanel {
+ private static final long serialVersionUID = 3336680912107956419L;
+
private Environment env;
private ExecutionManager runtime;
@@ -81,6 +81,7 @@
******/
MouseListener ml = new MouseAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
int selRow = tree.getRowForLocation(e.getX(), e.getY());
TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
@@ -112,6 +113,7 @@
private class SourceTreeToolListener implements SourceListener {
+ @Override
public void sourcepathChanged(SourcepathChangedEvent e) {
sourcePath = sourceManager.getSourcePath();
root = createDirectoryTree(HEADING);
@@ -121,6 +123,7 @@
}
private static class SourceOrDirectoryFilter implements FilenameFilter {
+ @Override
public boolean accept(File dir, String name) {
return (name.endsWith(".java") ||
new File(dir, name).isDirectory());
@@ -158,6 +161,7 @@
this.isDirectory = isDirectory;
}
+ @Override
public String toString() {
return name;
}
@@ -195,6 +199,7 @@
* Returns the child <code>TreeNode</code> at index
* <code>childIndex</code>.
*/
+ @Override
public TreeNode getChildAt(int childIndex) {
expandIfNeeded();
return children[childIndex];
@@ -204,6 +209,7 @@
* Returns the number of children <code>TreeNode</code>s the receiver
* contains.
*/
+ @Override
public int getChildCount() {
expandIfNeeded();
return children.length;
@@ -212,6 +218,7 @@
/**
* Returns the parent <code>TreeNode</code> of the receiver.
*/
+ @Override
public TreeNode getParent() {
return parent;
}
@@ -221,18 +228,21 @@
* If the receiver does not contain <code>node</code>, -1 will be
* returned.
*/
+ @Override
public int getIndex(TreeNode node) {
expandIfNeeded();
for (int i = 0; i < children.length; i++) {
- if (children[i] == node)
+ if (children[i] == node) {
return i;
}
+ }
return -1;
}
/**
* Returns true if the receiver allows children.
*/
+ @Override
public boolean getAllowsChildren() {
return isDirectory;
}
@@ -240,6 +250,7 @@
/**
* Returns true if the receiver is a leaf.
*/
+ @Override
public boolean isLeaf() {
expandIfNeeded();
return !isDirectory;
@@ -248,13 +259,16 @@
/**
* Returns the children of the receiver as an Enumeration.
*/
+ @Override
public Enumeration children() {
expandIfNeeded();
return new Enumeration() {
int i = 0;
+ @Override
public boolean hasMoreElements() {
return (i < children.length);
}
+ @Override
public Object nextElement() throws NoSuchElementException {
if (i >= children.length) {
throw new NoSuchElementException();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/SourcepathChangedEvent.java Wed Apr 27 20:24:30 2011 +0100
@@ -29,6 +29,8 @@
public class SourcepathChangedEvent extends EventObject {
+ private static final long serialVersionUID = 8762169481005804121L;
+
public SourcepathChangedEvent(Object source) {
super(source);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/StackTraceTool.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,21 +25,16 @@
package com.sun.tools.example.debug.gui;
-import java.io.*;
-import java.util.*;
-import java.util.List; // Must import explicitly due to conflict with javax.awt.List
-
import javax.swing.*;
-import javax.swing.tree.*;
import javax.swing.event.*;
import java.awt.*;
-import java.awt.event.*;
-
import com.sun.jdi.*;
import com.sun.tools.example.debug.bdi.*;
public class StackTraceTool extends JPanel {
+ private static final long serialVersionUID = 9140041989427965718L;
+
private Environment env;
private ExecutionManager runtime;
@@ -85,6 +80,7 @@
//### I suspect we handle the case badly that the VM is not interrupted.
+ @Override
public void currentFrameChanged(CurrentFrameChangedEvent e) {
// If the current frame of the thread appearing in this
// view is changed, move the selection to track it.
@@ -103,6 +99,7 @@
// ListSelectionListener
+ @Override
public void valueChanged(ListSelectionEvent e) {
int index = list.getSelectedIndex();
if (index != -1) {
@@ -117,6 +114,7 @@
private class StackFrameRenderer extends DefaultListCellRenderer {
+ @Override
public Component getListCellRendererComponent(JList list,
Object value,
int index,
@@ -174,6 +172,7 @@
this.tinfo = tinfo;
}
+ @Override
public Object getElementAt(int index) {
try {
return tinfo == null? null : tinfo.getFrame(index);
@@ -186,6 +185,7 @@
}
}
+ @Override
public int getSize() {
try {
return tinfo == null? 1 : tinfo.getFrameCount();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/ThreadTreeTool.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,13 +25,11 @@
package com.sun.tools.example.debug.gui;
-import java.io.*;
import java.util.*;
import java.util.List; // Must import explicitly due to conflict with javax.awt.List
import javax.swing.*;
import javax.swing.tree.*;
-import javax.swing.event.*;
import java.awt.*;
import java.awt.event.*;
@@ -45,6 +43,8 @@
public class ThreadTreeTool extends JPanel {
+ private static final long serialVersionUID = 4168599992853038878L;
+
private Environment env;
private ExecutionManager runtime;
@@ -79,6 +79,7 @@
tree.setSelectionModel(new SingleLeafTreeSelectionModel());
MouseListener ml = new MouseAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
int selRow = tree.getRowForLocation(e.getX(), e.getY());
TreePath selPath = tree.getPathForLocation(e.getX(), e.getY());
@@ -131,6 +132,7 @@
// SessionListener
+ @Override
public void sessionStart(EventObject e) {
try {
for (ThreadReference thread : runtime.allThreads()) {
@@ -143,20 +145,25 @@
}
}
+ @Override
public void sessionInterrupt(EventObject e) {}
+ @Override
public void sessionContinue(EventObject e) {}
// JDIListener
+ @Override
public void threadStart(ThreadStartEventSet e) {
root.addThread(e.getThread());
}
+ @Override
public void threadDeath(ThreadDeathEventSet e) {
root.removeThread(e.getThread());
}
+ @Override
public void vmDisconnect(VMDisconnectEventSet e) {
// Clear the contents of this view.
root = createThreadTree(HEADING);
@@ -193,6 +200,7 @@
}
}
+ @Override
public String toString() {
return description;
}
@@ -213,6 +221,7 @@
return (thread == null);
}
+ @Override
public boolean isLeaf() {
return !isThreadGroup();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScript.java Wed Apr 27 20:24:30 2011 +0100
@@ -28,10 +28,10 @@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
-import javax.swing.border.*;
public class TypeScript extends JPanel {
+ private static final long serialVersionUID = -983704841363534885L;
private JTextArea history;
private JTextField entry;
@@ -41,7 +41,6 @@
private JScrollBar historyHScrollBar;
private boolean echoInput = false;
- private boolean nlPending = false;
private static String newline = System.getProperty("line.separator");
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptOutputListener.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,7 +25,6 @@
package com.sun.tools.example.debug.gui;
-import javax.swing.*;
import com.sun.tools.example.debug.bdi.OutputListener;
public class TypeScriptOutputListener implements OutputListener {
@@ -42,10 +41,12 @@
this.appendNewline = appendNewline;
}
+ @Override
public void putString(String s) {
script.append(s);
- if (appendNewline)
+ if (appendNewline) {
script.newline();
}
+ }
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/gui/TypeScriptWriter.java Wed Apr 27 20:24:30 2011 +0100
@@ -35,14 +35,17 @@
this.script = script;
}
+ @Override
public void write(char[] cbuf, int off, int len) throws IOException {
script.append(String.valueOf(cbuf, off, len));
}
+ @Override
public void flush() {
script.flush();
}
+ @Override
public void close() {
script.flush();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/AccessWatchpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -38,6 +38,7 @@
/**
* The 'refType' is known to match, return the EventRequest.
*/
+ @Override
EventRequest resolveEventRequest(ReferenceType refType)
throws NoSuchFieldException {
Field field = refType.fieldByName(fieldId);
@@ -48,6 +49,7 @@
return wp;
}
+ @Override
public String toString() {
return MessageOutput.format("watch accesses of",
new Object [] {refSpec.toString(),
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/AmbiguousMethodException.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,6 +27,8 @@
public class AmbiguousMethodException extends Exception
{
+ private static final long serialVersionUID = -5372629264936918654L;
+
public AmbiguousMethodException()
{
super();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/BreakpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,7 +30,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Iterator;
class BreakpointSpec extends EventRequestSpec {
String methodId;
@@ -58,6 +57,7 @@
/**
* The 'refType' is known to match, return the EventRequest.
*/
+ @Override
EventRequest resolveEventRequest(ReferenceType refType)
throws AmbiguousMethodException,
AbsentInformationException,
@@ -91,12 +91,14 @@
return (methodId != null);
}
+ @Override
public int hashCode() {
return refSpec.hashCode() + lineNumber +
((methodId != null) ? methodId.hashCode() : 0) +
((methodArgs != null) ? methodArgs.hashCode() : 0);
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof BreakpointSpec) {
BreakpointSpec breakpoint = (BreakpointSpec)obj;
@@ -114,6 +116,7 @@
}
}
+ @Override
String errorMessageFor(Exception e) {
if (e instanceof AmbiguousMethodException) {
return (MessageOutput.format("Method is overloaded; specify arguments",
@@ -140,6 +143,7 @@
}
}
+ @Override
public String toString() {
StringBuffer buffer = new StringBuffer(refSpec.toString());
if (isMethodBreakpoint()) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/Commands.java Wed Apr 27 20:24:30 2011 +0100
@@ -51,6 +51,7 @@
final ThreadInfo threadInfo = ThreadInfo.getCurrentThreadInfo();
final int stackFrame = threadInfo == null? 0 : threadInfo.getCurrentFrameIndex();
Thread thread = new Thread("asynchronous jdb command") {
+ @Override
public void run() {
try {
action();
@@ -95,6 +96,7 @@
final ThreadInfo threadInfo = ThreadInfo.getCurrentThreadInfo();
if ((threadInfo != null) && (threadInfo.getCurrentFrame() != null)) {
frameGetter = new ExpressionParser.GetFrame() {
+ @Override
public StackFrame get() throws IncompatibleThreadStateException {
return threadInfo.getCurrentFrame();
}
@@ -224,7 +226,6 @@
}
void commandClass(StringTokenizer t) {
- List<ReferenceType> list = Env.vm().allClasses();
if (!t.hasMoreTokens()) {
MessageOutput.println("No class specified.");
@@ -709,6 +710,7 @@
void doKillThread(final ThreadReference threadToKill,
final StringTokenizer tokenizer) {
new AsyncExecution() {
+ @Override
void action() {
doKill(threadToKill, tokenizer);
}
@@ -1118,7 +1120,6 @@
}
void commandStop(StringTokenizer t) {
- Location bploc;
String atIn;
byte suspendPolicy = EventRequest.SUSPEND_ALL;
@@ -1665,6 +1666,7 @@
void commandPrint(final StringTokenizer t, final boolean dumpObject) {
new AsyncExecution() {
+ @Override
void action() {
doPrint(t, dumpObject);
}
@@ -1734,6 +1736,7 @@
void commandLock(final StringTokenizer t) {
new AsyncExecution() {
+ @Override
void action() {
doLock(t);
}
@@ -1809,6 +1812,7 @@
void commandDisableGC(final StringTokenizer t) {
new AsyncExecution() {
+ @Override
void action() {
doDisableGC(t);
}
@@ -1837,6 +1841,7 @@
void commandEnableGC(final StringTokenizer t) {
new AsyncExecution() {
+ @Override
void action() {
doEnableGC(t);
}
@@ -1892,6 +1897,7 @@
}
} else {
new AsyncExecution() {
+ @Override
void action() {
doSave(t);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/Env.java Wed Apr 27 20:24:30 2011 +0100
@@ -29,7 +29,6 @@
import com.sun.jdi.request.StepRequest;
import com.sun.jdi.request.MethodEntryRequest;
import com.sun.jdi.request.MethodExitRequest;
-import com.sun.tools.jdi.*;
import java.util.*;
import java.io.*;
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventHandler.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,14 +27,8 @@
import com.sun.jdi.*;
import com.sun.jdi.event.*;
-import com.sun.jdi.request.EventRequestManager;
import com.sun.jdi.request.EventRequest;
-import java.io.PrintStream;
-import java.util.StringTokenizer;
-import java.util.Collection;
-import java.util.Iterator;
-
public class EventHandler implements Runnable {
EventNotifier notifier;
@@ -59,6 +53,7 @@
}
}
+ @Override
public void run() {
EventQueue queue = Env.vm().eventQueue();
while (connected) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,9 +30,7 @@
import com.sun.jdi.request.ExceptionRequest;
import com.sun.jdi.request.ClassPrepareRequest;
import com.sun.jdi.event.ClassPrepareEvent;
-import java.util.List;
import java.util.ArrayList;
-import java.util.Iterator;
abstract class EventRequestSpec {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/EventRequestSpecList.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,15 +25,12 @@
package com.sun.tools.example.debug.tty;
-import com.sun.jdi.*;
import com.sun.jdi.request.EventRequest;
import com.sun.jdi.event.ClassPrepareEvent;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
-import java.util.StringTokenizer;
class EventRequestSpecList {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ExceptionSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -28,10 +28,6 @@
import com.sun.jdi.ReferenceType;
import com.sun.jdi.request.*;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
-
class ExceptionSpec extends EventRequestSpec {
private boolean notifyCaught;
private boolean notifyUncaught;
@@ -51,6 +47,7 @@
/**
* The 'refType' is known to match, return the EventRequest.
*/
+ @Override
EventRequest resolveEventRequest(ReferenceType refType) {
EventRequestManager em = refType.virtualMachine().eventRequestManager();
ExceptionRequest excReq = em.createExceptionRequest(refType,
@@ -68,6 +65,7 @@
return notifyUncaught;
}
+ @Override
public int hashCode() {
//Reference: Effective Java[tm] (Bloch, 2001), Item 8
int result = 17;
@@ -77,6 +75,7 @@
return result;
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof ExceptionSpec) {
ExceptionSpec es = (ExceptionSpec)obj;
@@ -90,6 +89,7 @@
return false;
}
+ @Override
public String toString() {
String s;
if (notifyCaught && !notifyUncaught) {
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/LineNotFoundException.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,6 +27,8 @@
public class LineNotFoundException extends Exception
{
+ private static final long serialVersionUID = 3748297722519448995L;
+
public LineNotFoundException()
{
super();
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/MalformedMemberNameException.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,6 +26,8 @@
package com.sun.tools.example.debug.tty;
class MalformedMemberNameException extends Exception {
+ private static final long serialVersionUID = 7759071468833196630L;
+
public MalformedMemberNameException() {
super();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ModificationWatchpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -38,6 +38,7 @@
/**
* The 'refType' is known to match, return the EventRequest.
*/
+ @Override
EventRequest resolveEventRequest(ReferenceType refType)
throws NoSuchFieldException {
Field field = refType.fieldByName(fieldId);
@@ -48,6 +49,7 @@
return wp;
}
+ @Override
public String toString() {
return MessageOutput.format("watch modification of",
new Object [] {refSpec.toString(),
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/PatternReferenceTypeSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -55,6 +55,7 @@
/**
* Does the specified ReferenceType match this spec.
*/
+ @Override
public boolean matches(ReferenceType refType) {
if (classId.startsWith("*")) {
return refType.name().endsWith(stem);
@@ -65,6 +66,7 @@
}
}
+ @Override
public ClassPrepareRequest createPrepareRequest() {
ClassPrepareRequest request =
Env.vm().eventRequestManager().createClassPrepareRequest();
@@ -73,10 +75,12 @@
return request;
}
+ @Override
public int hashCode() {
return classId.hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof PatternReferenceTypeSpec) {
PatternReferenceTypeSpec spec = (PatternReferenceTypeSpec)obj;
@@ -125,6 +129,7 @@
return true;
}
+ @Override
public String toString() {
return classId;
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ReferenceTypeSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -35,7 +35,9 @@
boolean matches(ReferenceType refType);
ClassPrepareRequest createPrepareRequest();
+ @Override
int hashCode();
+ @Override
boolean equals(Object obj);
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/SourceMapper.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,11 +27,8 @@
import com.sun.jdi.Location;
import com.sun.jdi.AbsentInformationException;
-import java.util.Map;
-import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.StringTokenizer;
import java.io.*;
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTY.java Wed Apr 27 20:24:30 2011 +0100
@@ -47,34 +47,43 @@
*/
private static final String progname = "jdb";
+ @Override
public void vmStartEvent(VMStartEvent se) {
Thread.yield(); // fetch output
MessageOutput.lnprint("VM Started:");
}
+ @Override
public void vmDeathEvent(VMDeathEvent e) {
}
+ @Override
public void vmDisconnectEvent(VMDisconnectEvent e) {
}
+ @Override
public void threadStartEvent(ThreadStartEvent e) {
}
+ @Override
public void threadDeathEvent(ThreadDeathEvent e) {
}
+ @Override
public void classPrepareEvent(ClassPrepareEvent e) {
}
+ @Override
public void classUnloadEvent(ClassUnloadEvent e) {
}
+ @Override
public void breakpointEvent(BreakpointEvent be) {
Thread.yield(); // fetch output
MessageOutput.lnprint("Breakpoint hit:");
}
+ @Override
public void fieldWatchEvent(WatchpointEvent fwe) {
Field field = fwe.field();
ObjectReference obj = fwe.object();
@@ -90,11 +99,13 @@
}
}
+ @Override
public void stepEvent(StepEvent se) {
Thread.yield(); // fetch output
MessageOutput.lnprint("Step completed:");
}
+ @Override
public void exceptionEvent(ExceptionEvent ee) {
Thread.yield(); // fetch output
Location catchLocation = ee.catchLocation();
@@ -108,6 +119,7 @@
}
}
+ @Override
public void methodEntryEvent(MethodEntryEvent me) {
Thread.yield(); // fetch output
/*
@@ -125,6 +137,7 @@
}
}
+ @Override
public boolean methodExitEvent(MethodExitEvent me) {
Thread.yield(); // fetch output
/*
@@ -173,6 +186,7 @@
return false;
}
+ @Override
public void vmInterrupted() {
Thread.yield(); // fetch output
printCurrentLocation();
@@ -184,6 +198,7 @@
MessageOutput.printPrompt();
}
+ @Override
public void receivedEvent(Event event) {
}
@@ -317,18 +332,19 @@
// Adapted for use with String[][0].
int low = 0;
int high = commandList.length - 1;
- long i = 0;
while (low <= high) {
int mid = (low + high) >>> 1;
String midVal = commandList[mid][0];
int compare = midVal.compareTo(key);
- if (compare < 0)
+ if (compare < 0) {
low = mid + 1;
- else if (compare > 0)
+ } else if (compare > 0) {
high = mid - 1;
- else
+ }
+ else {
return mid; // key found
}
+ }
return -(low + 1); // key not found.
};
@@ -336,7 +352,9 @@
* Return true if the command is OK when disconnected.
*/
private boolean isDisconnectCmd(int ii) {
- if (ii < 0 || ii >= commandList.length) return false;
+ if (ii < 0 || ii >= commandList.length) {
+ return false;
+ }
return (commandList[ii][1].equals("y"));
}
@@ -344,7 +362,9 @@
* Return true if the command is OK when readonly.
*/
private boolean isReadOnlyCmd(int ii) {
- if (ii < 0 || ii >= commandList.length) return false;
+ if (ii < 0 || ii >= commandList.length) {
+ return false;
+ }
return (commandList[ii][2].equals("y"));
};
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources.java Wed Apr 27 20:24:30 2011 +0100
@@ -44,6 +44,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
Object[][] temp = new Object[][] {
// NOTE: The value strings in this file containing "{0}" are
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_ja.java Wed Apr 27 20:24:30 2011 +0100
@@ -44,6 +44,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
Object[][] temp = new Object[][] {
// NOTE: The value strings in this file containing "{0}" are
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/TTYResources_zh_CN.java Wed Apr 27 20:24:30 2011 +0100
@@ -44,6 +44,7 @@
*
* @return the contents of this <code>ResourceBundle</code>.
*/
+ @Override
public Object[][] getContents() {
Object[][] temp = new Object[][] {
// NOTE: The value strings in this file containing "{0}" are
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadGroupIterator.java Wed Apr 27 20:24:30 2011 +0100
@@ -26,7 +26,6 @@
package com.sun.tools.example.debug.tty;
import com.sun.jdi.ThreadGroupReference;
-import com.sun.jdi.ThreadReference;
import java.util.List;
import java.util.Stack;
import java.util.ArrayList;
@@ -70,10 +69,12 @@
}
}
+ @Override
public boolean hasNext() {
return !stack.isEmpty();
}
+ @Override
public ThreadGroupReference next() {
return nextThreadGroup();
}
@@ -84,6 +85,7 @@
return tg;
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadInfo.java Wed Apr 27 20:24:30 2011 +0100
@@ -32,8 +32,6 @@
import java.util.List;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
-import java.io.*;
class ThreadInfo {
// This is a list of all known ThreadInfo objects. It survives
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/ThreadIterator.java Wed Apr 27 20:24:30 2011 +0100
@@ -46,6 +46,7 @@
tgi = new ThreadGroupIterator();
}
+ @Override
public boolean hasNext() {
while (it == null || !it.hasNext()) {
if (!tgi.hasNext()) {
@@ -56,6 +57,7 @@
return true;
}
+ @Override
public ThreadReference next() {
return it.next();
}
@@ -64,6 +66,7 @@
return next();
}
+ @Override
public void remove() {
throw new UnsupportedOperationException();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMConnection.java Wed Apr 27 20:24:30 2011 +0100
@@ -28,7 +28,6 @@
import com.sun.jdi.*;
import com.sun.jdi.connect.*;
import com.sun.jdi.request.EventRequestManager;
-import com.sun.jdi.request.ExceptionRequest;
import com.sun.jdi.request.ThreadStartRequest;
import com.sun.jdi.request.ThreadDeathRequest;
@@ -292,6 +291,7 @@
*/
private void displayRemoteOutput(final InputStream stream) {
Thread thr = new Thread("output reader") {
+ @Override
public void run() {
try {
dumpStream(stream);
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/VMNotConnectedException.java Wed Apr 27 20:24:30 2011 +0100
@@ -27,6 +27,8 @@
public class VMNotConnectedException extends RuntimeException {
+ private static final long serialVersionUID = -7433430494903950165L;
+
public VMNotConnectedException() {
super();
}
--- a/jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/debug/tty/WatchpointSpec.java Wed Apr 27 20:24:30 2011 +0100
@@ -25,8 +25,6 @@
package com.sun.tools.example.debug.tty;
-import com.sun.jdi.*;
-
abstract class WatchpointSpec extends EventRequestSpec {
final String fieldId;
@@ -39,11 +37,13 @@
}
}
+ @Override
public int hashCode() {
return refSpec.hashCode() + fieldId.hashCode() +
getClass().hashCode();
}
+ @Override
public boolean equals(Object obj) {
if (obj instanceof WatchpointSpec) {
WatchpointSpec watchpoint = (WatchpointSpec)obj;
@@ -56,6 +56,7 @@
}
}
+ @Override
String errorMessageFor(Exception e) {
if (e instanceof NoSuchFieldException) {
return (MessageOutput.format("No field in",
--- a/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/trace/EventThread.java Wed Apr 27 20:24:30 2011 +0100
@@ -49,7 +49,8 @@
private boolean vmDied = true; // VMDeath occurred
// Maps ThreadReference to ThreadTrace instances
- private Map traceMap = new HashMap();
+ private Map<ThreadReference, ThreadTrace> traceMap =
+ new HashMap<>();
EventThread(VirtualMachine vm, String[] excludes, PrintWriter writer) {
super("event-handler");
@@ -63,6 +64,7 @@
* As long as we are connected, get event sets off
* the queue and dispatch the events within them.
*/
+ @Override
public void run() {
EventQueue queue = vm.eventQueue();
while (connected) {
@@ -208,7 +210,7 @@
* creating one if needed.
*/
ThreadTrace threadTrace(ThreadReference thread) {
- ThreadTrace trace = (ThreadTrace)traceMap.get(thread);
+ ThreadTrace trace = traceMap.get(thread);
if (trace == null) {
trace = new ThreadTrace(thread);
traceMap.put(thread, trace);
@@ -297,7 +299,7 @@
}
void threadDeathEvent(ThreadDeathEvent event) {
- ThreadTrace trace = (ThreadTrace)traceMap.get(event.thread());
+ ThreadTrace trace = traceMap.get(event.thread());
if (trace != null) { // only want threads we care about
trace.threadDeathEvent(event); // Forward event
}
@@ -309,9 +311,8 @@
*/
private void classPrepareEvent(ClassPrepareEvent event) {
EventRequestManager mgr = vm.eventRequestManager();
- List fields = event.referenceType().visibleFields();
- for (Iterator it = fields.iterator(); it.hasNext(); ) {
- Field field = (Field)it.next();
+ List<Field> fields = event.referenceType().visibleFields();
+ for (Field field : fields) {
ModificationWatchpointRequest req =
mgr.createModificationWatchpointRequest(field);
for (int i=0; i<excludes.length; ++i) {
@@ -323,7 +324,7 @@
}
private void exceptionEvent(ExceptionEvent event) {
- ThreadTrace trace = (ThreadTrace)traceMap.get(event.thread());
+ ThreadTrace trace = traceMap.get(event.thread());
if (trace != null) { // only want threads we care about
trace.exceptionEvent(event); // Forward event
}
--- a/jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/trace/StreamRedirectThread.java Wed Apr 27 20:24:30 2011 +0100
@@ -56,6 +56,7 @@
/**
* Copy.
*/
+ @Override
public void run() {
try {
char[] cbuf = new char[BUFFER_SIZE];
--- a/jdk/src/share/classes/com/sun/tools/example/trace/Trace.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/com/sun/tools/example/trace/Trace.java Wed Apr 27 20:24:30 2011 +0100
@@ -31,7 +31,6 @@
import java.util.Map;
import java.util.List;
-import java.util.Iterator;
import java.io.PrintWriter;
import java.io.FileWriter;
@@ -155,7 +154,8 @@
*/
VirtualMachine launchTarget(String mainArgs) {
LaunchingConnector connector = findLaunchingConnector();
- Map arguments = connectorArguments(connector, mainArgs);
+ Map<String, Connector.Argument> arguments =
+ connectorArguments(connector, mainArgs);
try {
return connector.launch(arguments);
} catch (IOException exc) {
@@ -186,10 +186,8 @@
* Find a com.sun.jdi.CommandLineLaunch connector
*/
LaunchingConnector findLaunchingConnector() {
- List connectors = Bootstrap.virtualMachineManager().allConnectors();
- Iterator iter = connectors.iterator();
- while (iter.hasNext()) {
- Connector connector = (Connector)iter.next();
+ List<Connector> connectors = Bootstrap.virtualMachineManager().allConnectors();
+ for (Connector connector : connectors) {
if (connector.name().equals("com.sun.jdi.CommandLineLaunch")) {
return (LaunchingConnector)connector;
}
@@ -200,8 +198,8 @@
/**
* Return the launching connector's arguments.
*/
- Map connectorArguments(LaunchingConnector connector, String mainArgs) {
- Map arguments = connector.defaultArguments();
+ Map<String, Connector.Argument> connectorArguments(LaunchingConnector connector, String mainArgs) {
+ Map<String, Connector.Argument> arguments = connector.defaultArguments();
Connector.Argument mainArg =
(Connector.Argument)arguments.get("main");
if (mainArg == null) {
--- a/jdk/src/share/classes/sun/misc/FloatingDecimal.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/sun/misc/FloatingDecimal.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,7 +30,7 @@
import sun.misc.FloatConsts;
import java.util.regex.*;
-public strictfp class FloatingDecimal{
+public class FloatingDecimal{
boolean isExceptional;
boolean isNegative;
int decExponent;
@@ -239,8 +239,7 @@
* More difficult if subtracting and the argument
* is a normalized a power of 2, as the ULP changes at these points.
*/
- private static double
- ulp( double dval, boolean subtracting ){
+ private static double ulp( double dval, boolean subtracting ){
long lbits = Double.doubleToLongBits( dval ) & ~signMask;
int binexp = (int)(lbits >>> expShift);
double ulpval;
@@ -1251,8 +1250,7 @@
* for a single-precision float.
*/
- public double
- doubleValue(){
+ public strictfp double doubleValue(){
int kDigits = Math.min( nDigits, maxDecimalDigits+1 );
long lValue;
double dValue;
@@ -1611,8 +1609,7 @@
* ( because of the preference to a zero low-order bit ).
*/
- public float
- floatValue(){
+ public strictfp float floatValue(){
int kDigits = Math.min( nDigits, singleMaxDecimalDigits+1 );
int iValue;
float fValue;
--- a/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/classes/sun/misc/FormattedFloatingDecimal.java Wed Apr 27 20:24:30 2011 +0100
@@ -30,7 +30,7 @@
import sun.misc.FloatConsts;
import java.util.regex.*;
-public strictfp class FormattedFloatingDecimal{
+public class FormattedFloatingDecimal{
boolean isExceptional;
boolean isNegative;
int decExponent; // value set at construction, then immutable
@@ -247,8 +247,7 @@
* More difficult if subtracting and the argument
* is a normalized a power of 2, as the ULP changes at these points.
*/
- private static double
- ulp( double dval, boolean subtracting ){
+ private static double ulp( double dval, boolean subtracting ){
long lbits = Double.doubleToLongBits( dval ) & ~signMask;
int binexp = (int)(lbits >>> expShift);
double ulpval;
@@ -1157,8 +1156,7 @@
* for a single-precision float.
*/
- public double
- doubleValue(){
+ public strictfp double doubleValue(){
int kDigits = Math.min( nDigits, maxDecimalDigits+1 );
long lValue;
double dValue;
@@ -1517,8 +1515,7 @@
* ( because of the preference to a zero low-order bit ).
*/
- public float
- floatValue(){
+ public strictfp float floatValue(){
int kDigits = Math.min( nDigits, singleMaxDecimalDigits+1 );
int iValue;
float fValue;
--- a/jdk/src/share/demo/jvmti/minst/Minst.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/jvmti/minst/Minst.java Wed Apr 27 20:24:30 2011 +0100
@@ -45,7 +45,7 @@
*/
public static void method_entry(int cnum, int mnum) {
- Class x = Minst.class;
+ Class<Minst> x = Minst.class;
synchronized ( x ) {
if ( engaged > 0 ) {
engaged = 0;
--- a/jdk/src/share/demo/management/FullThreadDump/Deadlock.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/management/FullThreadDump/Deadlock.java Wed Apr 27 20:24:30 2011 +0100
@@ -48,7 +48,7 @@
*/
public class Deadlock {
public static void main(String[] argv) {
- Deadlock dl = new Deadlock();
+ new Deadlock();
// Now find deadlock
ThreadMonitor monitor = new ThreadMonitor();
@@ -112,6 +112,7 @@
this.mon2 = mon2;
this.useSync = false;
}
+ @Override
public void run() {
if (useSync) {
syncLock();
--- a/jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/management/FullThreadDump/ThreadMonitor.java Wed Apr 27 20:24:30 2011 +0100
@@ -39,7 +39,6 @@
import java.lang.management.MonitorInfo;
import javax.management.*;
import java.io.*;
-import java.util.*;
/**
* Example of using the java.lang.management API to dump stack trace
@@ -167,7 +166,8 @@
}
}
- private void printMonitorInfo(ThreadInfo ti, MonitorInfo[] monitors) {
+ private void printMonitorInfo(ThreadInfo ti) {
+ MonitorInfo[] monitors = ti.getLockedMonitors();
System.out.println(INDENT + "Locked monitors: count = " + monitors.length);
for (MonitorInfo mi : monitors) {
System.out.println(INDENT + " - " + mi + " locked at ");
@@ -201,6 +201,7 @@
ThreadInfo[] infos = tmbean.getThreadInfo(tids, true, true);
for (ThreadInfo ti : infos) {
printThreadInfo(ti);
+ printMonitorInfo(ti);
printLockInfo(ti.getLockedSynchronizers());
System.out.println();
}
--- a/jdk/src/share/demo/management/JTop/JTop.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/management/JTop/JTop.java Wed Apr 27 20:24:30 2011 +0100
@@ -57,7 +57,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
import java.util.SortedMap;
import java.util.Timer;
@@ -69,10 +68,8 @@
import static java.lang.management.ManagementFactory.*;
import java.awt.*;
-import java.awt.event.*;
import javax.swing.*;
import javax.swing.border.*;
-import javax.swing.event.*;
import javax.swing.table.*;
/**
@@ -80,6 +77,8 @@
* in a table.
*/
public class JTop extends JPanel {
+
+ private static final long serialVersionUID = -1499762160973870696L;
private MBeanServerConnection server;
private ThreadMXBean tmbean;
private MyTableModel tmodel;
@@ -122,29 +121,34 @@
}
class MyTableModel extends AbstractTableModel {
+ private static final long serialVersionUID = -7877310288576779514L;
private String[] columnNames = {"ThreadName",
"CPU(sec)",
"State"};
// List of all threads. The key of each entry is the CPU time
// and its value is the ThreadInfo object with no stack trace.
private List<Map.Entry<Long, ThreadInfo>> threadList =
- Collections.EMPTY_LIST;
+ Collections.emptyList();
public MyTableModel() {
}
+ @Override
public int getColumnCount() {
return columnNames.length;
}
+ @Override
public int getRowCount() {
return threadList.size();
}
+ @Override
public String getColumnName(int col) {
return columnNames[col];
}
+ @Override
public Object getValueAt(int row, int col) {
Map.Entry<Long, ThreadInfo> me = threadList.get(row);
switch (col) {
@@ -164,7 +168,8 @@
}
}
- public Class getColumnClass(int c) {
+ @Override
+ public Class<?> getColumnClass(int c) {
return getValueAt(0, c).getClass();
}
@@ -207,12 +212,14 @@
* Format Double with 4 fraction digits
*/
class DoubleRenderer extends DefaultTableCellRenderer {
+ private static final long serialVersionUID = 1704639497162584382L;
NumberFormat formatter;
public DoubleRenderer() {
super();
setHorizontalAlignment(JLabel.RIGHT);
}
+ @Override
public void setValue(Object value) {
if (formatter==null) {
formatter = NumberFormat.getInstance();
@@ -238,12 +245,14 @@
}
// Get the current thread info and CPU time
+ @Override
public List<Map.Entry<Long, ThreadInfo>> doInBackground() {
return getThreadList();
}
// fire table data changed to trigger GUI update
// when doInBackground() is finished
+ @Override
protected void done() {
try {
// Set table model with the new thread list
@@ -290,6 +299,7 @@
// A timer task to update GUI per each interval
TimerTask timerTask = new TimerTask() {
+ @Override
public void run() {
// Schedule the SwingWorker to update the GUI
jtop.newSwingWorker().execute();
@@ -299,6 +309,7 @@
// Create the standalone window with JTop panel
// by the event dispatcher thread
SwingUtilities.invokeAndWait(new Runnable() {
+ @Override
public void run() {
createAndShowGUI(jtop);
}
--- a/jdk/src/share/demo/management/JTop/JTopPlugin.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/management/JTop/JTopPlugin.java Wed Apr 27 20:24:30 2011 +0100
@@ -40,13 +40,13 @@
import java.beans.PropertyChangeListener;
import java.util.LinkedHashMap;
import java.util.Map;
-import javax.management.MBeanServerConnection;
+
import javax.swing.JPanel;
import javax.swing.SwingWorker;
-import com.sun.tools.jconsole.JConsolePlugin;
import com.sun.tools.jconsole.JConsoleContext;
import com.sun.tools.jconsole.JConsoleContext.ConnectionState;
+import com.sun.tools.jconsole.JConsolePlugin;
/**
* JTopPlugin is a subclass to com.sun.tools.jconsole.JConsolePlugin
@@ -70,6 +70,7 @@
/*
* Returns a JTop tab to be added in JConsole.
*/
+ @Override
public synchronized Map<String, JPanel> getTabs() {
if (tabs == null) {
jtop = new JTop();
@@ -86,6 +87,7 @@
/*
* Returns a SwingWorker which is responsible for updating the JTop tab.
*/
+ @Override
public SwingWorker<?,?> newSwingWorker() {
return jtop.newSwingWorker();
}
@@ -101,10 +103,10 @@
* Property listener to reset the MBeanServerConnection
* at reconnection time.
*/
+ @Override
public void propertyChange(PropertyChangeEvent ev) {
String prop = ev.getPropertyName();
if (prop == JConsoleContext.CONNECTION_STATE_PROPERTY) {
- ConnectionState oldState = (ConnectionState)ev.getOldValue();
ConnectionState newState = (ConnectionState)ev.getNewValue();
// JConsole supports disconnection and reconnection
// The MBeanServerConnection will become invalid when
--- a/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/management/MemoryMonitor/MemoryMonitor.java Wed Apr 27 20:24:30 2011 +0100
@@ -42,9 +42,6 @@
import javax.swing.border.EtchedBorder;
import javax.swing.border.TitledBorder;
import java.lang.management.*;
-import java.util.*;
-
-
/**
* Demo code which plots the memory usage by all memory pools.
* The memory usage is sampled at some time interval using
@@ -53,6 +50,7 @@
*/
public class MemoryMonitor extends JPanel {
+ private static final long serialVersionUID = -3463003810776195761L;
static JCheckBox dateStampCB = new JCheckBox("Output Date Stamp");
public Surface surf;
JPanel controls;
@@ -84,6 +82,7 @@
controls.add(dateStampCB);
dateStampCB.setFont(font);
addMouseListener(new MouseAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
removeAll();
if ((doControls = !doControls)) {
@@ -128,28 +127,32 @@
public Surface() {
setBackground(Color.black);
addMouseListener(new MouseAdapter() {
+ @Override
public void mouseClicked(MouseEvent e) {
if (thread == null) start(); else stop();
}
});
- int i = 0;
usedMem = new float[numPools][];
ptNum = new int[numPools];
}
+ @Override
public Dimension getMinimumSize() {
return getPreferredSize();
}
+ @Override
public Dimension getMaximumSize() {
return getPreferredSize();
}
+ @Override
public Dimension getPreferredSize() {
return new Dimension(135,80);
}
+ @Override
public void paint(Graphics g) {
if (big == null) {
@@ -315,13 +318,14 @@
notify();
}
+ @Override
public void run() {
Thread me = Thread.currentThread();
while (thread == me && !isShowing() || getSize().width == 0) {
try {
- thread.sleep(500);
+ Thread.sleep(500);
} catch (InterruptedException e) { return; }
}
@@ -339,7 +343,7 @@
}
repaint();
try {
- thread.sleep(sleepAmount);
+ Thread.sleep(sleepAmount);
} catch (InterruptedException e) { break; }
if (MemoryMonitor.dateStampCB.isSelected()) {
System.out.println(new Date().toString() + " " + usedStr);
@@ -354,6 +358,7 @@
static class Memeater extends ClassLoader implements Runnable {
Object y[];
public Memeater() {}
+ @Override
public void run() {
y = new Object[10000000];
int k =0;
@@ -378,7 +383,7 @@
}
- Class loadNext() throws ClassNotFoundException {
+ Class<?> loadNext() throws ClassNotFoundException {
// public class TestNNNNNN extends java.lang.Object{
// public TestNNNNNN();
@@ -424,15 +429,15 @@
int len = begin.length + value.length + end.length;
byte b[] = new byte[len];
- int i, pos=0;
- for (i=0; i<begin.length; i++) {
- b[pos++] = (byte)begin[i];
+ int pos=0;
+ for (int i: begin) {
+ b[pos++] = (byte) i;
}
- for (i=0; i<value.length; i++) {
- b[pos++] = value[i];
+ for (byte v: value) {
+ b[pos++] = v;
}
- for (i=0; i<end.length; i++) {
- b[pos++] = (byte)end[i];
+ for (int e: end) {
+ b[pos++] = (byte) e;
}
return defineClass(name, b, 0, b.length);
@@ -445,8 +450,11 @@
public static void main(String s[]) {
final MemoryMonitor demo = new MemoryMonitor();
WindowListener l = new WindowAdapter() {
+ @Override
public void windowClosing(WindowEvent e) {System.exit(0);}
+ @Override
public void windowDeiconified(WindowEvent e) { demo.surf.start(); }
+ @Override
public void windowIconified(WindowEvent e) { demo.surf.stop(); }
};
JFrame f = new JFrame("MemoryMonitor");
--- a/jdk/src/share/demo/management/VerboseGC/PrintGCStat.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/management/VerboseGC/PrintGCStat.java Wed Apr 27 20:24:30 2011 +0100
@@ -71,12 +71,10 @@
assert(false);
}
- Set mbeans = server.queryNames(poolName, null);
+ Set<ObjectName> mbeans = server.queryNames(poolName, null);
if (mbeans != null) {
pools = new ArrayList<MemoryPoolMXBean>();
- Iterator iterator = mbeans.iterator();
- while (iterator.hasNext()) {
- ObjectName objName = (ObjectName) iterator.next();
+ for (ObjectName objName : mbeans) {
MemoryPoolMXBean p =
newPlatformMXBeanProxy(server,
objName.getCanonicalName(),
@@ -88,9 +86,7 @@
mbeans = server.queryNames(gcName, null);
if (mbeans != null) {
gcmbeans = new ArrayList<GarbageCollectorMXBean>();
- Iterator iterator = mbeans.iterator();
- while (iterator.hasNext()) {
- ObjectName objName = (ObjectName) iterator.next();
+ for (ObjectName objName : mbeans) {
GarbageCollectorMXBean gc =
newPlatformMXBeanProxy(server,
objName.getCanonicalName(),
@@ -116,7 +112,9 @@
* of all memory pools as well as the GC statistics.
*/
public void printVerboseGc() {
- System.out.print("Uptime: " + formatMillis(rmbean.getUptime()));
+ System.out.println("Uptime: " + formatMillis(rmbean.getUptime()));
+ System.out.println("Heap usage: " + mmbean.getHeapMemoryUsage());
+ System.out.println("Non-Heap memory usage: " + mmbean.getNonHeapMemoryUsage());
for (GarbageCollectorMXBean gc : gcmbeans) {
System.out.print(" [" + gc.getName() + ": ");
System.out.print("Count=" + gc.getCollectionCount());
--- a/jdk/src/share/demo/management/VerboseGC/VerboseGC.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/management/VerboseGC/VerboseGC.java Wed Apr 27 20:24:30 2011 +0100
@@ -95,9 +95,8 @@
int port = -1;
long interval = 5000; // default is 5 second interval
long mins = 5;
- for (int argIndex = 0; argIndex < args.length; argIndex++) {
- String arg = args[argIndex];
- if (args[argIndex].startsWith("-")) {
+ for (String arg: args) {
+ if (arg.startsWith("-")) {
if (arg.equals("-h") ||
arg.equals("-help") ||
arg.equals("-?")) {
--- a/jdk/src/share/demo/nio/zipfs/Demo.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/nio/zipfs/Demo.java Wed Apr 27 20:24:30 2011 +0100
@@ -42,7 +42,6 @@
import static java.nio.file.StandardOpenOption.*;
import static java.nio.file.StandardCopyOption.*;
-
/*
* ZipFileSystem usage demo
*
@@ -157,7 +156,6 @@
env.put("create", "true");
try (FileSystem fs = provider.newFileSystem(Paths.get(args[1]), env)) {
Path path, src, dst;
- boolean isRename = false;
switch (action) {
case rename:
src = fs.getPath(args[2]);
@@ -303,6 +301,7 @@
final String fStr = (args.length > 3)?args[3]:"";
try (DirectoryStream<Path> ds = Files.newDirectoryStream(path,
new DirectoryStream.Filter<Path>() {
+ @Override
public boolean accept(Path path) {
return path.toString().contains(fStr);
}
@@ -358,10 +357,18 @@
return null;
}
+ @SuppressWarnings("unused")
+ /**
+ * Not used in demo, but included for demonstrational purposes.
+ */
private static byte[] getBytes(String name) {
return name.getBytes();
}
+ @SuppressWarnings("unused")
+ /**
+ * Not used in demo, but included for demonstrational purposes.
+ */
private static String getString(byte[] name) {
return new String(name);
}
@@ -534,6 +541,10 @@
Files.createDirectory(path);
}
+ @SuppressWarnings("unused")
+ /**
+ * Not used in demo, but included for demonstrational purposes.
+ */
private static void rmdirs(Path path) throws IOException {
while (path != null && path.getNameCount() != 0) {
Files.delete(path);
@@ -557,7 +568,11 @@
}
}
- // check the content of two paths are equal
+ @SuppressWarnings("unused")
+ /**
+ * Checks that the content of two paths are equal.
+ * Not used in demo, but included for demonstrational purposes.
+ */
private static void checkEqual(Path src, Path dst) throws IOException
{
//System.out.printf("checking <%s> vs <%s>...%n",
--- a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/EditableAtEndDocument.java Wed Apr 27 20:24:30 2011 +0100
@@ -38,14 +38,18 @@
* document. This is used in ScriptShellPanel class as document for editor.
*/
public class EditableAtEndDocument extends PlainDocument {
+
+ private static final long serialVersionUID = 5358116444851502167L;
private int mark;
+ @Override
public void insertString(int offset, String text, AttributeSet a)
throws BadLocationException {
int len = getLength();
super.insertString(len, text, a);
}
+ @Override
public void remove(int offs, int len) throws BadLocationException {
int start = offs;
int end = offs + len;
--- a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptJConsolePlugin.java Wed Apr 27 20:24:30 2011 +0100
@@ -32,14 +32,10 @@
package com.sun.demo.scripting.jconsole;
import com.sun.tools.jconsole.*;
-import java.awt.*;
-import java.awt.event.*;
import java.io.*;
-import java.lang.reflect.*;
import java.util.concurrent.CountDownLatch;
import javax.script.*;
import javax.swing.*;
-import javax.swing.event.*;
import java.util.*;
/**
@@ -86,6 +82,7 @@
tabs.put("Script Shell", window);
new Thread(new Runnable() {
+ @Override
public void run() {
// initialize the script engine
initScriptEngine();
@@ -103,10 +100,12 @@
window.dispose();
}
+ @Override
public String getPrompt() {
return prompt;
}
+ @Override
public String executeCommand(String cmd) {
String res;
try {
@@ -176,7 +175,7 @@
String oldFilename = (String) engine.get(ScriptEngine.FILENAME);
engine.put(ScriptEngine.FILENAME, "<built-in jconsole." + extension + ">");
try {
- Class myClass = this.getClass();
+ Class<? extends ScriptJConsolePlugin> myClass = this.getClass();
InputStream stream = myClass.getResourceAsStream("/resources/jconsole." +
extension);
if (stream != null) {
--- a/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/share/demo/scripting/jconsole-plugin/src/com/sun/demo/scripting/jconsole/ScriptShellPanel.java Wed Apr 27 20:24:30 2011 +0100
@@ -44,8 +44,11 @@
* A JPanel subclass containing a scrollable text area displaying the
* jconsole's script console.
*/
+
class ScriptShellPanel extends JPanel {
+ private static final long serialVersionUID = 4116273141148726319L;
+
// interface to evaluate script command and script prompt
interface CommandProcessor {
// execute given String as script and return the result
@@ -75,9 +78,11 @@
add(scroller, BorderLayout.CENTER);
editor.getDocument().addDocumentListener(new DocumentListener() {
+ @Override
public void changedUpdate(DocumentEvent e) {
}
+ @Override
public void insertUpdate(DocumentEvent e) {
if (updating) return;
beginUpdate();
@@ -90,10 +95,12 @@
// Trim "\\n" combinations
final String cmd1 = trimContinuations(cmd);
commandExecutor.execute(new Runnable() {
+ @Override
public void run() {
final String result = executeCommand(cmd1);
SwingUtilities.invokeLater(new Runnable() {
+ @Override
public void run() {
if (result != null) {
print(result + "\n");
@@ -113,6 +120,7 @@
}
}
+ @Override
public void removeUpdate(DocumentEvent e) {
}
});
@@ -121,6 +129,7 @@
// the JEditorPane to update the caret's position precisely the
// size of the insertion
editor.addCaretListener(new CaretListener() {
+ @Override
public void caretUpdate(CaretEvent e) {
int len = editor.getDocument().getLength();
if (e.getDot() > len) {
@@ -133,6 +142,7 @@
hbox.add(Box.createGlue());
JButton button = new JButton("Clear"); // FIXME: i18n?
button.addActionListener(new ActionListener() {
+ @Override
public void actionPerformed(ActionEvent e) {
clear();
}
@@ -148,6 +158,7 @@
commandExecutor.shutdown();
}
+ @Override
public void requestFocus() {
editor.requestFocus();
}
--- a/jdk/src/solaris/classes/sun/nio/ch/EPoll.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/solaris/classes/sun/nio/ch/EPoll.java Wed Apr 27 20:24:30 2011 +0100
@@ -99,8 +99,6 @@
// -- Native methods --
- private static native void init();
-
private static native int eventSize();
private static native int eventsOffset();
@@ -116,6 +114,5 @@
static {
Util.load();
- init();
}
}
--- a/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/solaris/classes/sun/nio/fs/LinuxWatchService.java Wed Apr 27 20:24:30 2011 +0100
@@ -432,8 +432,6 @@
// -- native methods --
- private static native void init();
-
// sizeof inotify_event
private static native int eventSize();
@@ -461,6 +459,5 @@
System.loadLibrary("nio");
return null;
}});
- init();
}
}
--- a/jdk/src/solaris/native/sun/nio/ch/EPoll.c Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/solaris/native/sun/nio/ch/EPoll.c Wed Apr 27 20:24:30 2011 +0100
@@ -34,55 +34,7 @@
#include <dlfcn.h>
#include <unistd.h>
#include <sys/types.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* epoll_wait(2) man page */
-
-typedef union epoll_data {
- void *ptr;
- int fd;
- __uint32_t u32;
- __uint64_t u64;
-} epoll_data_t;
-
-struct epoll_event {
- __uint32_t events; /* Epoll events */
- epoll_data_t data; /* User data variable */
-} __attribute__ ((__packed__));
-
-#ifdef __cplusplus
-}
-#endif
-
-/*
- * epoll event notification is new in 2.6 kernel. As the offical build
- * platform for the JDK is on a 2.4-based distribution then we must
- * obtain the addresses of the epoll functions dynamically.
- */
-typedef int (*epoll_create_t)(int size);
-typedef int (*epoll_ctl_t) (int epfd, int op, int fd, struct epoll_event *event);
-typedef int (*epoll_wait_t) (int epfd, struct epoll_event *events, int maxevents, int timeout);
-
-static epoll_create_t epoll_create_func;
-static epoll_ctl_t epoll_ctl_func;
-static epoll_wait_t epoll_wait_func;
-
-
-JNIEXPORT void JNICALL
-Java_sun_nio_ch_EPoll_init(JNIEnv *env, jclass this)
-{
- epoll_create_func = (epoll_create_t) dlsym(RTLD_DEFAULT, "epoll_create");
- epoll_ctl_func = (epoll_ctl_t) dlsym(RTLD_DEFAULT, "epoll_ctl");
- epoll_wait_func = (epoll_wait_t) dlsym(RTLD_DEFAULT, "epoll_wait");
-
- if ((epoll_create_func == NULL) || (epoll_ctl_func == NULL) ||
- (epoll_wait_func == NULL)) {
- JNU_ThrowInternalError(env, "unable to get address of epoll functions, pre-2.6 kernel?");
- }
-}
+#include <sys/epoll.h>
JNIEXPORT jint JNICALL
Java_sun_nio_ch_EPoll_eventSize(JNIEnv* env, jclass this)
@@ -108,7 +60,7 @@
* epoll_create expects a size as a hint to the kernel about how to
* dimension internal structures. We can't predict the size in advance.
*/
- int epfd = (*epoll_create_func)(256);
+ int epfd = epoll_create(256);
if (epfd < 0) {
JNU_ThrowIOExceptionWithLastError(env, "epoll_create failed");
}
@@ -125,7 +77,7 @@
event.events = events;
event.data.fd = fd;
- RESTARTABLE((*epoll_ctl_func)(epfd, (int)opcode, (int)fd, &event), res);
+ RESTARTABLE(epoll_ctl(epfd, (int)opcode, (int)fd, &event), res);
return (res == 0) ? 0 : errno;
}
@@ -137,7 +89,7 @@
struct epoll_event *events = jlong_to_ptr(address);
int res;
- RESTARTABLE((*epoll_wait_func)(epfd, events, numfds, -1), res);
+ RESTARTABLE(epoll_wait(epfd, events, numfds, -1), res);
if (res < 0) {
JNU_ThrowIOExceptionWithLastError(env, "epoll_wait failed");
}
--- a/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/src/solaris/native/sun/nio/fs/LinuxWatchService.c Wed Apr 27 20:24:30 2011 +0100
@@ -33,33 +33,10 @@
#include <sys/types.h>
#include <sys/socket.h>
#include <sys/poll.h>
+#include <sys/inotify.h>
#include "sun_nio_fs_LinuxWatchService.h"
-/* inotify.h may not be available at build time */
-#ifdef __cplusplus
-extern "C" {
-#endif
-struct inotify_event
-{
- int wd;
- uint32_t mask;
- uint32_t cookie;
- uint32_t len;
- char name __flexarr;
-};
-#ifdef __cplusplus
-}
-#endif
-
-typedef int inotify_init_func(void);
-typedef int inotify_add_watch_func(int fd, const char* path, uint32_t mask);
-typedef int inotify_rm_watch_func(int fd, uint32_t wd);
-
-inotify_init_func* my_inotify_init_func = NULL;
-inotify_add_watch_func* my_inotify_add_watch_func = NULL;
-inotify_rm_watch_func* my_inotify_rm_watch_func = NULL;
-
static void throwUnixException(JNIEnv* env, int errnum) {
jobject x = JNU_NewObjectByName(env, "sun/nio/fs/UnixException",
"(I)V", errnum);
@@ -68,22 +45,6 @@
}
}
-JNIEXPORT void JNICALL
-Java_sun_nio_fs_LinuxWatchService_init(JNIEnv *env, jclass clazz)
-{
- my_inotify_init_func = (inotify_init_func*)
- dlsym(RTLD_DEFAULT, "inotify_init");
- my_inotify_add_watch_func =
- (inotify_add_watch_func*) dlsym(RTLD_DEFAULT, "inotify_add_watch");
- my_inotify_rm_watch_func =
- (inotify_rm_watch_func*) dlsym(RTLD_DEFAULT, "inotify_rm_watch");
-
- if ((my_inotify_init_func == NULL) || (my_inotify_add_watch_func == NULL) ||
- (my_inotify_rm_watch_func == NULL)) {
- JNU_ThrowInternalError(env, "unable to get address of inotify functions");
- }
-}
-
JNIEXPORT jint JNICALL
Java_sun_nio_fs_LinuxWatchService_eventSize(JNIEnv *env, jclass clazz)
{
@@ -111,7 +72,7 @@
Java_sun_nio_fs_LinuxWatchService_inotifyInit
(JNIEnv* env, jclass clazz)
{
- int ifd = (*my_inotify_init_func)();
+ int ifd = inotify_init();
if (ifd == -1) {
throwUnixException(env, errno);
}
@@ -125,7 +86,7 @@
int wfd = -1;
const char* path = (const char*)jlong_to_ptr(address);
- wfd = (*my_inotify_add_watch_func)((int)fd, path, mask);
+ wfd = inotify_add_watch((int)fd, path, mask);
if (wfd == -1) {
throwUnixException(env, errno);
}
@@ -136,7 +97,7 @@
Java_sun_nio_fs_LinuxWatchService_inotifyRmWatch
(JNIEnv* env, jclass clazz, jint fd, jint wd)
{
- int err = (*my_inotify_rm_watch_func)((int)fd, (int)wd);
+ int err = inotify_rm_watch((int)fd, (int)wd);
if (err == -1)
throwUnixException(env, errno);
}
@@ -166,7 +127,6 @@
res[1] = (jint)sp[1];
(*env)->SetIntArrayRegion(env, sv, 0, 2, &res[0]);
}
-
}
JNIEXPORT jint JNICALL
@@ -190,6 +150,4 @@
}
}
return (jint)n;
-
-
}
--- a/jdk/test/java/lang/Double/ParseDouble.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/test/java/lang/Double/ParseDouble.java Wed Apr 27 20:24:30 2011 +0100
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4160406 4705734 4707389 4826774 4895911 4421494 7021568
+ * @bug 4160406 4705734 4707389 4826774 4895911 4421494 7021568 7039369
* @summary Test for Double.parseDouble method and acceptance regex
*/
--- a/jdk/test/sun/security/krb5/auto/BadKdc.java Wed Apr 27 20:21:32 2011 +0100
+++ b/jdk/test/sun/security/krb5/auto/BadKdc.java Wed Apr 27 20:24:30 2011 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -22,8 +22,14 @@
*/
import java.io.*;
+import java.net.BindException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import javax.security.auth.login.LoginException;
+import sun.security.krb5.Asn1Exception;
import sun.security.krb5.Config;
public class BadKdc {
@@ -34,8 +40,51 @@
static final Pattern re = Pattern.compile(
">>> KDCCommunication: kdc=kdc.rabbit.hole UDP:(\\d)...., " +
"timeout=(\\d)000,");
+
+ /*
+ * There are several cases this test fails:
+ *
+ * 1. The random selected port is used by another process. No good way to
+ * prevent this happening, coz krb5.conf must be written before KDC starts.
+ * There are two different outcomes:
+ *
+ * a. Cannot start the KDC. A BindException thrown.
+ * b. When trying to access a non-existing KDC, a response is received!
+ * Most likely a Asn1Exception thrown
+ *
+ * 2. Even if a KDC is started, and more than 20 seconds pass by, a timeout
+ * can still happens for the first UDP request. In fact, the KDC did not
+ * received it at all. This happens on almost all platforms, especially
+ * solaris-i586 and solaris-x64.
+ *
+ * To avoid them:
+ *
+ * 1. Catch those exceptions and ignore
+ *
+ * 2. a. Make the timeout longer? useless
+ * b. Read the output carefully, if there is a timeout, it's OK.
+ * Just make sure the retries times and KDCs are correct.
+ * This is tough.
+ * c. Feed the KDC a UDP packet first. The current "solution".
+ */
public static void go(int[]... expected)
throws Exception {
+ try {
+ go0(expected);
+ } catch (BindException be) {
+ System.out.println("The random port is used by another process");
+ } catch (LoginException le) {
+ Throwable cause = le.getCause();
+ if (cause instanceof Asn1Exception) {
+ System.out.println("Bad packet possibly from another process");
+ return;
+ }
+ throw le;
+ }
+ }
+
+ public static void go0(int[]... expected)
+ throws Exception {
System.setProperty("sun.security.krb5.debug", "true");
// Make sure KDCs' ports starts with 1 and 2 and 3,
@@ -78,20 +127,39 @@
KDC k = new KDC(OneKDC.REALM, OneKDC.KDCHOST, p, true);
k.addPrincipal(OneKDC.USER, OneKDC.PASS);
k.addPrincipalRandKey("krbtgt/" + OneKDC.REALM);
+ // Feed a packet to newly started KDC to warm it up
+ System.err.println("-------- IGNORE THIS ERROR MESSAGE --------");
+ new DatagramSocket().send(
+ new DatagramPacket("Hello".getBytes(), 5,
+ InetAddress.getByName(OneKDC.KDCHOST), p));
return k;
}
+ private static void test(int... expected) throws Exception {
+ ByteArrayOutputStream bo = new ByteArrayOutputStream();
+ try {
+ test0(bo, expected);
+ } catch (Exception e) {
+ System.out.println("----------------- ERROR -----------------");
+ System.out.println(new String(bo.toByteArray()));
+ System.out.println("--------------- ERROR END ---------------");
+ throw e;
+ }
+ }
+
/**
* One round of test for max_retries and timeout.
- * @param timeout the expected timeout
* @param expected the expected kdc# timeout kdc# timeout...
*/
- private static void test(int... expected) throws Exception {
- ByteArrayOutputStream bo = new ByteArrayOutputStream();
+ private static void test0(ByteArrayOutputStream bo, int... expected)
+ throws Exception {
PrintStream oldout = System.out;
System.setOut(new PrintStream(bo));
- Context c = Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
- System.setOut(oldout);
+ try {
+ Context.fromUserPass(OneKDC.USER, OneKDC.PASS, false);
+ } finally {
+ System.setOut(oldout);
+ }
String[] lines = new String(bo.toByteArray()).split("\n");
System.out.println("----------------- TEST -----------------");