diff options
Diffstat (limited to 'gnu/classpath/jdwp/event')
| -rw-r--r-- | gnu/classpath/jdwp/event/ClassPrepareEvent.java | 6 | ||||
| -rw-r--r-- | gnu/classpath/jdwp/event/ClassUnloadEvent.java | 4 | ||||
| -rw-r--r-- | gnu/classpath/jdwp/event/EventManager.java | 107 | ||||
| -rw-r--r-- | gnu/classpath/jdwp/event/EventRequest.java | 16 | ||||
| -rw-r--r-- | gnu/classpath/jdwp/event/ExceptionEvent.java | 6 | ||||
| -rw-r--r-- | gnu/classpath/jdwp/event/filters/ClassMatchFilter.java | 4 | ||||
| -rw-r--r-- | gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java | 6 | ||||
| -rw-r--r-- | gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java | 6 | ||||
| -rw-r--r-- | gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java | 9 |
9 files changed, 84 insertions, 80 deletions
diff --git a/gnu/classpath/jdwp/event/ClassPrepareEvent.java b/gnu/classpath/jdwp/event/ClassPrepareEvent.java index f21f8e7c0..b3d421c2a 100644 --- a/gnu/classpath/jdwp/event/ClassPrepareEvent.java +++ b/gnu/classpath/jdwp/event/ClassPrepareEvent.java @@ -1,6 +1,6 @@ /* ClassPrepareEvent.java -- An event specifying that a class has been prepared by the virtual machine - Copyright (C) 2005 Free Software Foundation + Copyright (C) 2005, 2013 Free Software Foundation This file is part of GNU Classpath. @@ -65,7 +65,7 @@ public class ClassPrepareEvent private Thread _thread; // The class that was prepared - private Class _class; + private Class<?> _class; // Prepare flags private int _status; @@ -101,7 +101,7 @@ public class ClassPrepareEvent * @param clazz class which was prepared * @param flags prepare status flags */ - public ClassPrepareEvent (Thread thread, Class clazz, int flags) + public ClassPrepareEvent (Thread thread, Class<?> clazz, int flags) { super (JdwpConstants.EventKind.CLASS_PREPARE); _thread = thread; diff --git a/gnu/classpath/jdwp/event/ClassUnloadEvent.java b/gnu/classpath/jdwp/event/ClassUnloadEvent.java index a35d3b9bd..d7e564d92 100644 --- a/gnu/classpath/jdwp/event/ClassUnloadEvent.java +++ b/gnu/classpath/jdwp/event/ClassUnloadEvent.java @@ -1,5 +1,5 @@ /* ClassUnloadEvent.java -- event generated when a class is unloaded - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2013 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,7 +88,7 @@ public class ClassUnloadEvent protected void _writeData(DataOutputStream outStream) throws IOException { - VMIdManager idm = VMIdManager.getDefault(); + VMIdManager.getDefault(); JdwpString.writeString(outStream, _signature); } diff --git a/gnu/classpath/jdwp/event/EventManager.java b/gnu/classpath/jdwp/event/EventManager.java index 3f34a5ee9..e1c821bbf 100644 --- a/gnu/classpath/jdwp/event/EventManager.java +++ b/gnu/classpath/jdwp/event/EventManager.java @@ -1,5 +1,5 @@ /* EventManager.java -- event management and notification infrastructure - Copyright (C) 2005, 2006, 2007 Free Software Foundation + Copyright (C) 2005, 2006, 2007, 2013 Free Software Foundation This file is part of GNU Classpath. @@ -74,7 +74,7 @@ public class EventManager private static EventManager _instance = null; // maps event (EVENT_*) to lists of EventRequests - private Hashtable _requests = null; + private Hashtable<Byte,Hashtable<Integer,EventRequest>> _requests = null; /** * Returns an instance of the event manager @@ -92,41 +92,41 @@ public class EventManager // Private constructs a new <code>EventManager</code> private EventManager () { - _requests = new Hashtable (); + _requests = new Hashtable<Byte,Hashtable<Integer,EventRequest>>(); // Add lists for all the event types - _requests.put (new Byte (EventRequest.EVENT_SINGLE_STEP), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_BREAKPOINT), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_FRAME_POP), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_EXCEPTION), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_USER_DEFINED), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_THREAD_START), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_THREAD_END), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_CLASS_PREPARE), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_CLASS_UNLOAD), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_CLASS_LOAD), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_FIELD_ACCESS), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_FIELD_MODIFY), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_METHOD_ENTRY), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_METHOD_EXIT), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_VM_INIT), - new Hashtable ()); - _requests.put (new Byte (EventRequest.EVENT_VM_DEATH), - new Hashtable ()); + _requests.put (Byte.valueOf(EventRequest.EVENT_SINGLE_STEP), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_BREAKPOINT), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_FRAME_POP), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_EXCEPTION), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_USER_DEFINED), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_THREAD_START), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_THREAD_END), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_CLASS_PREPARE), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_CLASS_UNLOAD), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_CLASS_LOAD), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_FIELD_ACCESS), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_FIELD_MODIFY), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_METHOD_ENTRY), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_METHOD_EXIT), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_VM_INIT), + new Hashtable<Integer,EventRequest>()); + _requests.put (Byte.valueOf(EventRequest.EVENT_VM_DEATH), + new Hashtable<Integer,EventRequest>()); // Add auto-generated event notifications // only two: VM_INIT, VM_DEATH @@ -157,10 +157,10 @@ public class EventManager */ public EventRequest[] getEventRequests(Event event) { - ArrayList interestedEvents = new ArrayList(); - Hashtable requests; - Byte kind = new Byte(event.getEventKind()); - requests = (Hashtable) _requests.get(kind); + ArrayList<EventRequest> interestedEvents = new ArrayList<EventRequest>(); + Hashtable<Integer,EventRequest> requests; + Byte kind = Byte.valueOf(event.getEventKind()); + requests = _requests.get(kind); if (requests == null) { // Did not get a valid event type @@ -169,10 +169,10 @@ public class EventManager // Loop through the requests. Must look at ALL requests in order // to evaluate all filters (think count filter). - Iterator rIter = requests.values().iterator(); + Iterator<EventRequest> rIter = requests.values().iterator(); while (rIter.hasNext()) { - EventRequest request = (EventRequest) rIter.next(); + EventRequest request = rIter.next(); if (request.matches(event)) interestedEvents.add(request); } @@ -200,9 +200,9 @@ public class EventManager throws JdwpException { // Add request to request list - Hashtable requests; + Hashtable<Integer,EventRequest> requests; Byte kind = new Byte (request.getEventKind ()); - requests = (Hashtable) _requests.get (kind); + requests = _requests.get (kind); if (requests == null) { // Did not get a valid event type @@ -211,7 +211,7 @@ public class EventManager // Register the event with the VM VMVirtualMachine.registerEvent (request); - requests.put (new Integer (request.getId ()), request); + requests.put (Integer.valueOf (request.getId ()), request); } /** @@ -225,16 +225,16 @@ public class EventManager public void deleteRequest (byte kind, int id) throws JdwpException { - Hashtable requests; - requests = (Hashtable) _requests.get (new Byte (kind)); + Hashtable<Integer,EventRequest> requests; + requests = _requests.get (Byte.valueOf (kind)); if (requests == null) { // Did not get a valid event type throw new IllegalArgumentException ("invalid event kind: " + kind); } - Integer iid = new Integer (id); - EventRequest request = (EventRequest) requests.get (iid); + Integer iid = Integer.valueOf (id); + EventRequest request = requests.get (iid); if (request != null) { VMVirtualMachine.unregisterEvent (request); @@ -252,7 +252,7 @@ public class EventManager public void clearRequests (byte kind) throws JdwpException { - Hashtable requests = (Hashtable) _requests.get (new Byte (kind)); + Hashtable<Integer,EventRequest> requests = _requests.get (Byte.valueOf(kind)); if (requests == null) { // Did not get a valid event type @@ -274,14 +274,14 @@ public class EventManager */ public EventRequest getRequest (byte kind, int id) { - Hashtable requests = (Hashtable) _requests.get (new Byte (kind)); + Hashtable<Integer,EventRequest> requests = _requests.get(Byte.valueOf(kind)); if (requests == null) { // Did not get a valid event type throw new IllegalArgumentException ("invalid event kind: " + kind); } - return (EventRequest) requests.get (new Integer (id)); + return requests.get (Integer.valueOf(id)); } /** @@ -291,9 +291,10 @@ public class EventManager * @returns a <code>Collection</code> of all the registered requests * @throws IllegalArgumentException for invalid event kind */ - public Collection getRequests (byte kind) + public Collection<EventRequest> getRequests (byte kind) { - Hashtable requests = (Hashtable) _requests.get (new Byte (kind)); + Hashtable<Integer,EventRequest> requests = + _requests.get (Byte.valueOf (kind)); if (requests == null) { // Did not get a valid event type diff --git a/gnu/classpath/jdwp/event/EventRequest.java b/gnu/classpath/jdwp/event/EventRequest.java index 891da229b..d5b560d04 100644 --- a/gnu/classpath/jdwp/event/EventRequest.java +++ b/gnu/classpath/jdwp/event/EventRequest.java @@ -1,5 +1,5 @@ /* EventRequest.java -- an event request from the debugger - Copyright (C) 2005, 2006 Free Software Foundation + Copyright (C) 2005, 2006, 2013 Free Software Foundation This file is part of GNU Classpath. @@ -185,7 +185,7 @@ public class EventRequest private static Object _idLock = new Object (); // A list of filters - private LinkedList _filters; + private LinkedList<IEventFilter> _filters; // The ID of this request private int _id; @@ -204,7 +204,7 @@ public class EventRequest */ public EventRequest (byte kind, byte suspendPolicy) { - _filters = new LinkedList (); + _filters = new LinkedList<IEventFilter>(); synchronized (_idLock) { _id = ++_last_id; @@ -222,7 +222,7 @@ public class EventRequest */ public EventRequest (int id, byte kind, byte suspendPolicy) { - _filters = new LinkedList (); + _filters = new LinkedList<IEventFilter>(); _kind = kind; _suspendPolicy = suspendPolicy; } @@ -240,7 +240,7 @@ public class EventRequest // Check validity of filter for this request boolean valid = true; - Class clazz = filter.getClass (); + Class<?> clazz = filter.getClass (); if (clazz == ClassExcludeFilter.class) { if (_kind == EVENT_THREAD_START @@ -321,7 +321,7 @@ public class EventRequest /** * Returns the filters attached to this request */ - public Collection getFilters () + public Collection<IEventFilter> getFilters () { return _filters; } @@ -370,10 +370,10 @@ public class EventRequest // Loop through filters; all must match // Note that we must allow EVERY filter to evaluate. This way // things like CountFilter will work. - Iterator iter = _filters.iterator (); + Iterator<IEventFilter> iter = _filters.iterator (); while (iter.hasNext ()) { - IEventFilter filter = (IEventFilter) iter.next (); + IEventFilter filter = iter.next (); if (!filter.matches (theEvent)) matches = false; } diff --git a/gnu/classpath/jdwp/event/ExceptionEvent.java b/gnu/classpath/jdwp/event/ExceptionEvent.java index e63f5df12..ff36c47b5 100644 --- a/gnu/classpath/jdwp/event/ExceptionEvent.java +++ b/gnu/classpath/jdwp/event/ExceptionEvent.java @@ -1,5 +1,5 @@ /* ExceptionEvent.java -- an event specifying an exception has been thrown - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006, 2013 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -72,7 +72,7 @@ public class ExceptionEvent private Location _catchLocation; //the class where the exeption was thrown - private Class _klass; + private Class<?> _klass; /** * Constructs a new <code>ExceptionEvent</code> where the exception was @@ -85,7 +85,7 @@ public class ExceptionEvent * @param instance the instance that threw the exception */ public ExceptionEvent(Throwable exception, Thread thread, Location location, - Location catchLocation, Class clazz, Object instance) + Location catchLocation, Class<?> clazz, Object instance) { super(JdwpConstants.EventKind.EXCEPTION); _exception = exception; diff --git a/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java b/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java index edb84d7ef..e366a36d3 100644 --- a/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java +++ b/gnu/classpath/jdwp/event/filters/ClassMatchFilter.java @@ -1,5 +1,5 @@ /* ClassMatchFilter.java -- filter on class name (inclusive) - Copyright (C) 2005 Free Software Foundation + Copyright (C) 2005, 2013 Free Software Foundation This file is part of GNU Classpath. @@ -93,7 +93,7 @@ public class ClassMatchFilter Object type = event.getParameter (Event.EVENT_CLASS); if (type != null) { - Class eventClass = (Class) type; + Class<?> eventClass = (Class<?>) type; String name = eventClass.getName (); if (_pattern.startsWith ("*")) diff --git a/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java b/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java index d912cb5ef..52567af69 100644 --- a/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java +++ b/gnu/classpath/jdwp/event/filters/ClassOnlyFilter.java @@ -1,5 +1,5 @@ /* ClassOnlyFilter.java -- filter on specific class - Copyright (C) 2005 Free Software Foundation + Copyright (C) 2005, 2013 Free Software Foundation This file is part of GNU Classpath. @@ -92,8 +92,8 @@ public class ClassOnlyFilter { try { - Class clazz = _id.getType (); - Class eventClass = (Class) type; + Class<?> clazz = _id.getType (); + Class<?> eventClass = (Class<?>) type; if (clazz.isAssignableFrom (eventClass)) return true; } diff --git a/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java b/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java index d4687fa4e..3924630a0 100644 --- a/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java +++ b/gnu/classpath/jdwp/event/filters/ExceptionOnlyFilter.java @@ -1,5 +1,5 @@ /* ExceptionOnlyFilter.java -- filter for excetions by caught/uncaught and type - Copyright (C) 2005, 2006 Free Software Foundation + Copyright (C) 2005, 2006, 2013 Free Software Foundation This file is part of GNU Classpath. @@ -103,8 +103,8 @@ public class ExceptionOnlyFilter { try { - Class klass - = (Class) event.getParameter(Event.EVENT_EXCEPTION_CLASS); + Class<?> klass + = (Class<?>) event.getParameter(Event.EVENT_EXCEPTION_CLASS); classMatch = klass == _refId.getType(); } catch (InvalidClassException ex) diff --git a/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java b/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java index 47a804101..4fd561026 100644 --- a/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java +++ b/gnu/classpath/jdwp/event/filters/FieldOnlyFilter.java @@ -1,5 +1,5 @@ /* FieldOnlyFilter.java -- filter on field - Copyright (C) 2005 Free Software Foundation + Copyright (C) 2005, 2013 Free Software Foundation This file is part of GNU Classpath. @@ -69,11 +69,14 @@ public class FieldOnlyFilter public FieldOnlyFilter (ReferenceTypeId refId, /*Field*/ReferenceTypeId fid) throws InvalidClassException, InvalidFieldException { - if (refId == null || refId.getReference().get () == null) + if (refId == null) + throw new InvalidClassException(); + + if (refId.getReference().get () == null) throw new InvalidClassException (refId.getId ()); if (fid == null) - throw new InvalidFieldException (fid.getId ()); + throw new InvalidFieldException (); _refId = refId; _fieldId = fid; |