# HG changeset patch # User clanger # Date 1496307679 -7200 # Thu Jun 01 11:01:19 2017 +0200 # Node ID 35a71c4b40c405a95aed1f87e1950d21779a724b # Parent df64bd4757d0d130d62a22b8143ba31d3a16ac18 8181417: Code cleanups in com.sun.jdi diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java b/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/AbsentInformationException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -31,16 +31,15 @@ * @author Gordon Hirsch * @since 1.3 */ -public class AbsentInformationException extends Exception -{ +public class AbsentInformationException extends Exception { + private static final long serialVersionUID = 4988939309582416373L; - public AbsentInformationException() - { + + public AbsentInformationException() { super(); } - public AbsentInformationException(String s) - { + public AbsentInformationException(String s) { super(s); } } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/ArrayType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -25,8 +25,6 @@ package com.sun.jdi; -import java.util.List; - /** * Provides access to the class of an array and the type of * its components in the target VM. diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotLoadedException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -67,9 +67,10 @@ * @author Gordon Hirsch * @since 1.3 */ -public class ClassNotLoadedException extends Exception -{ +public class ClassNotLoadedException extends Exception { + private static final long serialVersionUID = -6242978768444298722L; + private String className; public ClassNotLoadedException(String className) { diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/ClassNotPreparedException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -33,14 +33,14 @@ * @since 1.3 */ public class ClassNotPreparedException extends RuntimeException { + private static final long serialVersionUID = -6120698967144079642L; - public ClassNotPreparedException() - { + + public ClassNotPreparedException() { super(); } - public ClassNotPreparedException(String s) - { + public ClassNotPreparedException(String s) { super(s); } } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/ClassType.java @@ -42,6 +42,7 @@ * @since 1.3 */ public interface ClassType extends ReferenceType { + /** * Gets the superclass of this class. * diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java b/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/IncompatibleThreadStateException.java @@ -33,6 +33,7 @@ * @since 1.3 */ public class IncompatibleThreadStateException extends Exception { + private static final long serialVersionUID = 6199174323414551389L; public IncompatibleThreadStateException() { diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InconsistentDebugInfoException.java @@ -35,7 +35,9 @@ * @since 1.3 */ public class InconsistentDebugInfoException extends RuntimeException { + private static final long serialVersionUID = 7964236415376861808L; + public InconsistentDebugInfoException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java b/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InterfaceType.java @@ -44,6 +44,7 @@ * @since 1.3 */ public interface InterfaceType extends ReferenceType { + /** * Gets the interfaces directly extended by this interface. * The returned list contains only those interfaces this @@ -187,11 +188,12 @@ * @since 1.8 */ default Value invokeMethod(ThreadReference thread, Method method, - List arguments, int options) + List arguments, int options) throws InvalidTypeException, - ClassNotLoadedException, - IncompatibleThreadStateException, - InvocationException { + ClassNotLoadedException, + IncompatibleThreadStateException, + InvocationException + { throw new UnsupportedOperationException(); } } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InternalException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2017, 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 @@ -33,18 +33,20 @@ * @since 1.3 */ public class InternalException extends RuntimeException { - private static final long serialVersionUID = -9171606393104480607L; - private int errorCode; - public InternalException() { - super(); - this.errorCode = 0; - } + private static final long serialVersionUID = -9171606393104480607L; - public InternalException(String s) { - super(s); - this.errorCode = 0; - } + private int errorCode; + + public InternalException() { + super(); + this.errorCode = 0; + } + + public InternalException(String s) { + super(s); + this.errorCode = 0; + } public InternalException(int errorCode) { super(); diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidCodeIndexException.java @@ -36,7 +36,9 @@ */ @Deprecated public class InvalidCodeIndexException extends RuntimeException { + private static final long serialVersionUID = 7416010225133747805L; + public InvalidCodeIndexException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidLineNumberException.java @@ -36,7 +36,9 @@ */ @Deprecated public class InvalidLineNumberException extends RuntimeException { + private static final long serialVersionUID = 4048709912372692875L; + public InvalidLineNumberException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidModuleException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidModuleException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidModuleException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidModuleException.java @@ -33,6 +33,7 @@ * @since 9 */ public class InvalidModuleException extends RuntimeException { + private static final long serialVersionUID = 7907359387320658039L; /** diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidStackFrameException.java @@ -33,7 +33,9 @@ * @since 1.3 */ public class InvalidStackFrameException extends RuntimeException { + private static final long serialVersionUID = -1919378296505827922L; + public InvalidStackFrameException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InvalidTypeException.java @@ -33,6 +33,7 @@ * @since 1.3 */ public class InvalidTypeException extends Exception { + private static final long serialVersionUID = 2256667231949650806L; public InvalidTypeException() { diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java b/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/InvocationException.java @@ -33,7 +33,9 @@ * @since 1.3 */ public class InvocationException extends Exception { + private static final long serialVersionUID = 6066780907971918568L; + ObjectReference exception; public InvocationException(ObjectReference exception) { diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java b/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/JDIPermission.java @@ -80,7 +80,9 @@ */ public final class JDIPermission extends java.security.BasicPermission { + private static final long serialVersionUID = -6988461416938786271L; + /** * The {@code JDIPermission} class represents access rights to the * {@code VirtualMachineManager} diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java b/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/Locatable.java @@ -34,6 +34,7 @@ * @since 1.3 */ public interface Locatable { + /** * Returns the {@link Location} of this mirror, if there is * executable code associated with it. Note that both Java™ diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/Location.java b/src/jdk.jdi/share/classes/com/sun/jdi/Location.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/Location.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/Location.java @@ -25,8 +25,6 @@ package com.sun.jdi; -import java.util.List; - /** * A point within the executing code of the target VM. * Locations are used to identify the current position of @@ -128,7 +126,6 @@ */ String sourceName() throws AbsentInformationException; - /** * Gets an identifing name for the source corresponding to * this location. Interpretation of this string is the @@ -154,8 +151,7 @@ * * @since 1.4 */ - String sourceName(String stratum) - throws AbsentInformationException; + String sourceName(String stratum) throws AbsentInformationException; /** * Gets the path to the source corresponding to this @@ -173,7 +169,6 @@ */ String sourcePath() throws AbsentInformationException; - /** * Gets the path to the source corresponding to this * location. Interpretation of this string is the @@ -206,8 +201,7 @@ * * @since 1.4 */ - String sourcePath(String stratum) - throws AbsentInformationException; + String sourcePath(String stratum) throws AbsentInformationException; /** * Gets the line number of this Location. diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java b/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/NativeMethodException.java @@ -35,6 +35,7 @@ public class NativeMethodException extends RuntimeException { private static final long serialVersionUID = 3924951669039469992L; + public NativeMethodException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectCollectedException.java @@ -33,7 +33,9 @@ * @since 1.3 */ public class ObjectCollectedException extends RuntimeException { + private static final long serialVersionUID = -1928428056197269588L; + public ObjectCollectedException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/ObjectReference.java @@ -422,7 +422,6 @@ */ List referringObjects(long maxReferrers); - /** * Compares the specified Object with this ObjectReference for equality. * diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java b/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/PathSearchingVirtualMachine.java @@ -34,6 +34,7 @@ * @since 1.3 */ public interface PathSearchingVirtualMachine extends VirtualMachine { + /** * Get the class path for this virtual machine. * diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java b/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/ReferenceType.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -78,8 +78,7 @@ * @since 1.3 */ public interface ReferenceType - extends Type, Comparable, Accessible -{ + extends Type, Comparable, Accessible { /** * Gets the fully qualified name of this type. The returned name @@ -615,7 +614,7 @@ * @since 1.4 */ List allLineLocations(String stratum, String sourceName) - throws AbsentInformationException; + throws AbsentInformationException; /** * Returns a List containing all {@link Location} objects @@ -850,5 +849,4 @@ * @since 1.6 */ byte[] constantPool(); - } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java b/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/StackFrame.java @@ -235,5 +235,4 @@ * @since 1.6 */ List getArgumentValues(); - } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/StringReference.java @@ -36,6 +36,7 @@ * @since 1.3 */ public interface StringReference extends ObjectReference { + /** * Returns the StringReference as a String. The returned string * is the equivalent of the mirrored string, but is an entity in the diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/ThreadReference.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -24,6 +24,7 @@ */ package com.sun.jdi; + import java.util.List; /** @@ -37,6 +38,7 @@ * @since 1.3 */ public interface ThreadReference extends ObjectReference { + /** Thread status is unknown */ public final int THREAD_STATUS_UNKNOWN =-1; /** Thread has completed execution */ @@ -82,6 +84,7 @@ * through {@link java.lang.Thread#resume}. * @throws VMCannotBeModifiedException if the VirtualMachine is read-only - see {@link VirtualMachine#canBeModified()}. */ + @SuppressWarnings("javadoc") void suspend(); /** @@ -115,6 +118,7 @@ * @throws VMCannotBeModifiedException if the VirtualMachine is read-only - see {@link VirtualMachine#canBeModified()}. * @see java.lang.Thread#stop(Throwable) */ + @SuppressWarnings("javadoc") void stop(ObjectReference throwable) throws InvalidTypeException; /** @@ -390,7 +394,6 @@ * @since 1.4 */ void popFrames(StackFrame frame) throws IncompatibleThreadStateException; - /** * Force a method to return before it reaches a return * statement. diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VMCannotBeModifiedException.java @@ -33,7 +33,9 @@ * @since 1.5 */ public class VMCannotBeModifiedException extends UnsupportedOperationException { + private static final long serialVersionUID = -4063879815130164009L; + public VMCannotBeModifiedException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java b/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VMDisconnectedException.java @@ -36,6 +36,7 @@ public class VMDisconnectedException extends RuntimeException { private static final long serialVersionUID = 2892975269768351637L; + public VMDisconnectedException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java b/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VMMismatchException.java @@ -34,7 +34,9 @@ * @since 1.3 */ public class VMMismatchException extends RuntimeException { + private static final long serialVersionUID = 289169358790459564L; + public VMMismatchException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java b/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VMOutOfMemoryException.java @@ -33,7 +33,9 @@ * @since 1.3 */ public class VMOutOfMemoryException extends RuntimeException { + private static final long serialVersionUID = 71504228548910686L; + public VMOutOfMemoryException() { super(); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/Value.java b/src/jdk.jdi/share/classes/com/sun/jdi/Value.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/Value.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/Value.java @@ -170,6 +170,7 @@ */ public interface Value extends Mirror { + /** * Returns the run-time type of this value. * diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachine.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -25,13 +25,13 @@ package com.sun.jdi; -import com.sun.jdi.event.EventQueue; -import com.sun.jdi.ModuleReference; -import com.sun.jdi.request.EventRequestManager; - import java.util.List; import java.util.Map; +import com.sun.jdi.connect.spi.Connection; +import com.sun.jdi.event.EventQueue; +import com.sun.jdi.request.EventRequestManager; + /** * A virtual machine targeted for debugging. * More precisely, a {@link Mirror mirror} representing the diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/VirtualMachineManager.java @@ -25,10 +25,14 @@ package com.sun.jdi; -import com.sun.jdi.connect.*; +import java.io.IOException; +import java.util.List; + +import com.sun.jdi.connect.AttachingConnector; +import com.sun.jdi.connect.Connector; +import com.sun.jdi.connect.LaunchingConnector; +import com.sun.jdi.connect.ListeningConnector; import com.sun.jdi.connect.spi.Connection; -import java.util.List; -import java.io.IOException; /** * A manager of connections to target virtual machines. The diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/AttachingConnector.java @@ -25,9 +25,10 @@ package com.sun.jdi.connect; +import java.io.IOException; +import java.util.Map; + import com.sun.jdi.VirtualMachine; -import java.util.Map; -import java.io.IOException; /** * A connector which attaches to a previously running target VM. @@ -36,6 +37,7 @@ * @since 1.3 */ public interface AttachingConnector extends Connector { + /** * Attaches to a running application and returns a * mirror of its VM. diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/Connector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -25,9 +25,9 @@ package com.sun.jdi.connect; +import java.io.Serializable; +import java.util.List; import java.util.Map; -import java.util.List; -import java.io.Serializable; /** * A method of connection between a debugger and a target VM. @@ -46,6 +46,7 @@ * @since 1.3 */ public interface Connector { + /** * Returns a short identifier for the connector. Connector implementors * should follow similar naming conventions as are used with packages @@ -82,7 +83,7 @@ * @return the map associating argument names with argument * information and default value. */ - Map defaultArguments(); + Map defaultArguments(); /** * Specification for and value of a Connector argument. @@ -92,6 +93,7 @@ * or {@link Connector.SelectedArgument}. */ public interface Argument extends Serializable { + /** * Returns a short, unique identifier for the argument. * Not intended for exposure to end-user. @@ -157,6 +159,7 @@ * by the localized versions of the strings "true" and "false". */ public interface BooleanArgument extends Argument { + /** * Sets the value of the argument. */ @@ -197,6 +200,7 @@ * by their corresponding strings. */ public interface IntegerArgument extends Argument { + /** * Sets the value of the argument. * The value should be checked with {@link #isValid(int)} diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/IllegalConnectorArgumentsException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -39,6 +39,7 @@ public class IllegalConnectorArgumentsException extends Exception { private static final long serialVersionUID = -3042212603611350941L; + List names; /** @@ -48,8 +49,7 @@ * @param s the detailed message. * @param name the name of the invalid or inconsistent argument. */ - public IllegalConnectorArgumentsException(String s, - String name) { + public IllegalConnectorArgumentsException(String s, String name) { super(s); names = new ArrayList(1); names.add(name); @@ -65,7 +65,6 @@ */ public IllegalConnectorArgumentsException(String s, List names) { super(s); - this.names = new ArrayList(names); } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/LaunchingConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -25,9 +25,10 @@ package com.sun.jdi.connect; +import java.io.IOException; +import java.util.Map; + import com.sun.jdi.VirtualMachine; -import java.util.Map; -import java.io.IOException; /** * A connector which can launch a target VM before connecting to it. @@ -36,6 +37,7 @@ * @since 1.3 */ public interface LaunchingConnector extends Connector { + /** * Launches an application and connects to its VM. Properties * of the launch (possibly including options, diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/ListeningConnector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -25,8 +25,9 @@ package com.sun.jdi.connect; +import java.io.IOException; import java.util.Map; -import java.io.IOException; + import com.sun.jdi.VirtualMachine; /** @@ -36,6 +37,7 @@ * @since 1.3 */ public interface ListeningConnector extends Connector { + /** * Indicates whether this listening connector supports multiple * connections for a single argument map. If so, a call to @@ -96,7 +98,6 @@ void stopListening(Map arguments) throws IOException, IllegalConnectorArgumentsException; - /** * Waits for a target VM to attach to this connector. * @@ -113,5 +114,4 @@ */ VirtualMachine accept(Map arguments) throws IOException, IllegalConnectorArgumentsException; - } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/Transport.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -25,16 +25,16 @@ package com.sun.jdi.connect; -import com.sun.jdi.connect.spi.TransportService; // for javadoc +import com.sun.jdi.connect.spi.TransportService; /** * A method of communication between a debugger and a target VM. * *

A Transport represents the transport mechanism used by a - * {@link com.sun.jdi.connect.Connector Connector} to establish a + * {@link Connector Connector} to establish a * connection with a target VM. It consists of a name which is obtained * by invoking the {@link #name} method. Furthermore, a Transport - * encapsulates a {@link com.sun.jdi.connect.spi.TransportService + * encapsulates a {@link TransportService * TransportService} which is the underlying service used * to establish connections and exchange Java Debug Wire Protocol * (JDWP) packets with a target VM. @@ -43,6 +43,7 @@ * @since 1.3 */ public interface Transport { + /** * Returns a short identifier for the transport. * diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/TransportTimeoutException.java @@ -55,7 +55,9 @@ * @since 1.5 */ public class TransportTimeoutException extends java.io.IOException { + private static final long serialVersionUID = 4107035242623365074L; + /** * Constructs a {@code TransportTimeoutException} with no detail * message. @@ -63,7 +65,6 @@ public TransportTimeoutException() { } - /** * Constructs a {@code TransportTimeoutException} with the * specified detail message. @@ -73,5 +74,4 @@ public TransportTimeoutException(String message) { super(message); } - } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/VMStartException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2017, 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 @@ -37,6 +37,7 @@ public class VMStartException extends Exception { private static final long serialVersionUID = 6408644824640801020L; + Process process; public VMStartException(Process process) { @@ -44,8 +45,7 @@ this.process = process; } - public VMStartException(String message, - Process process) { + public VMStartException(String message, Process process) { super(message); this.process = process; } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/ClosedConnectionException.java @@ -46,7 +46,9 @@ * @since 1.5 */ public class ClosedConnectionException extends java.io.IOException { + private static final long serialVersionUID = 3877032124297204774L; + /** * Constructs a {@code ClosedConnectionException} with no detail * message. @@ -63,5 +65,4 @@ public ClosedConnectionException(String message) { super(message); } - } diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/Connection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2017, 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 @@ -32,14 +32,14 @@ * *

A Connection represents a bi-directional communication channel * between a debugger and a target VM. A Connection is created when - * {@link com.sun.jdi.connect.spi.TransportService TransportService} + * {@link TransportService TransportService} * establishes a connection and successfully handshakes with a target * VM. A TransportService implementation provides a reliable * JDWP packet transportation service and consequently a Connection * provides a reliable flow of JDWP packets between the debugger * and the target VM. A Connection is stream oriented, that is, the * JDWP packets written to a connection are read by the target VM - * in the order in which they were written. Similiarly packets written + * in the order in which they were written. Similarly packets written * to a Connection by the target VM are read by the debugger in the * order in which they were written. * @@ -55,7 +55,6 @@ * * @since 1.5 */ - public abstract class Connection { /** diff --git a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java --- a/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java +++ b/src/jdk.jdi/share/classes/com/sun/jdi/connect/spi/TransportService.java @@ -26,6 +26,7 @@ package com.sun.jdi.connect.spi; import java.io.IOException; + import com.sun.jdi.connect.TransportTimeoutException; /** @@ -76,7 +77,6 @@ * * @since 1.5 */ - public abstract class TransportService { /** @@ -108,7 +108,6 @@ */ public abstract boolean supportsMultipleConnections(); - /** * Tell whether or not this transport service supports a timeout * when attaching to a target VM. @@ -144,7 +143,6 @@ * @see #accept(TransportService.ListenKey,long,long) */ public abstract boolean supportsHandshakeTimeout(); - } /** @@ -373,5 +371,4 @@ */ public abstract Connection accept(ListenKey listenKey, long acceptTimeout, long handshakeTimeout) throws IOException; - }