[cp-patches] [PATCH/JDWP] New exceptions & a fix

[Keith Seitz]

Hi,

I've committed the attached patch which adds a couple of missing 
exceptions and fixes some typos in InvalidThreadGroupException.

Keith

ChangeLog
2005-08-20  Keith Seitz  <address@hidden>

        * gnu/classpath/jdwp/exception/InvalidThreadGroupException.java
        (InvalidThreadGroupException): Fix misleading string error
        message.
        (InvalidThreadGroupException): Fix typo -- should be
        JdwpConstants.Error.INVALID_THREAD_GROUP.

        * gnu/classpath/jdwp/exception/InvalidClassLoaderException.java:
        New exception.
        * gnu/classpath/jdwp/exception/InvalidFieldException.java: New
        exception.
        * gnu/classpath/jdwp/exception/InvalidLocationException.java:
        New exception.
        * gnu/classpath/jdwp/exception/InvalidMethodException.java: New
        exception.

Index: gnu/classpath/jdwp/exception/InvalidClassLoaderException.java
===================================================================
RCS file: gnu/classpath/jdwp/exception/InvalidClassLoaderException.java
diff -N gnu/classpath/jdwp/exception/InvalidClassLoaderException.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/exception/InvalidClassLoaderException.java       20 Aug 
2005 18:51:51 -0000
@@ -0,0 +1,62 @@
+/* InvalidClassLoaderException.java -- an invalid class loader exception
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.exception;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * An exception thrown when the debugger uses an invalid class loader
+ *
+ * @author Keith Seitz  (address@hidden)
+ */
+public class InvalidClassLoaderException
+  extends JdwpException
+{
+  public InvalidClassLoaderException (long id)
+  {
+    super (JdwpConstants.Error.INVALID_CLASS_LOADER,
+          "invalid class loader (" + id + ")");
+  }
+
+  public InvalidClassLoaderException (Throwable t)
+  {
+    super (JdwpConstants.Error.INVALID_CLASS_LOADER, t);
+  }
+}
Index: gnu/classpath/jdwp/exception/InvalidFieldException.java
===================================================================
RCS file: gnu/classpath/jdwp/exception/InvalidFieldException.java
diff -N gnu/classpath/jdwp/exception/InvalidFieldException.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/exception/InvalidFieldException.java     20 Aug 2005 
18:51:51 -0000
@@ -0,0 +1,63 @@
+/* InvalidFieldException.java -- an invalid field id exception
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.exception;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * An exception thrown when an invalid field id is used by the
+ * debugger
+ *
+ * @author Keith Seitz  (address@hidden)
+ */
+public class InvalidFieldException
+  extends JdwpException
+{
+  public InvalidFieldException (long id)
+  {
+    super (JdwpConstants.Error.INVALID_FIELDID,
+          "invalid field id (" + id + ")");
+  }
+
+  public InvalidFieldException (Throwable t)
+  {
+    super (JdwpConstants.Error.INVALID_FIELDID, t);
+  }
+}
Index: gnu/classpath/jdwp/exception/InvalidLocationException.java
===================================================================
RCS file: gnu/classpath/jdwp/exception/InvalidLocationException.java
diff -N gnu/classpath/jdwp/exception/InvalidLocationException.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/exception/InvalidLocationException.java  20 Aug 2005 
18:51:51 -0000
@@ -0,0 +1,62 @@
+/* InvalidLocationException.java -- an invalid location exception
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.exception;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * An exception thrown when the debugger specifies an invalid location
+ *
+ * @author Keith Seitz  (address@hidden)
+ */
+public class InvalidLocationException
+  extends JdwpException
+{
+  public InvalidLocationException (/*something*/)
+  {
+    super (JdwpConstants.Error.INVALID_LOCATION,
+          "invalid location (" + "something" + ")");
+  }
+
+  public InvalidLocationException (Throwable t)
+  {
+    super (JdwpConstants.Error.INVALID_LOCATION, t);
+  }
+}
Index: gnu/classpath/jdwp/exception/InvalidMethodException.java
===================================================================
RCS file: gnu/classpath/jdwp/exception/InvalidMethodException.java
diff -N gnu/classpath/jdwp/exception/InvalidMethodException.java
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ gnu/classpath/jdwp/exception/InvalidMethodException.java    20 Aug 2005 
18:51:51 -0000
@@ -0,0 +1,63 @@
+/* InvalidMethodException.java -- an invalid method id exception
+   Copyright (C) 2005 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+
+package gnu.classpath.jdwp.exception;
+
+import gnu.classpath.jdwp.JdwpConstants;
+
+/**
+ * An exception thrown when an invalid method id is used
+ * by the debugger
+ *
+ * @author Keith Seitz  (address@hidden)
+ */
+public class InvalidMethodException
+  extends JdwpException
+{
+  public InvalidMethodException (long id)
+  {
+    super (JdwpConstants.Error.INVALID_METHODID,
+          "invalid method id (" + id + ")");
+  }
+
+  public InvalidMethodException (Throwable t)
+  {
+    super (JdwpConstants.Error.INVALID_METHODID, t);
+  }
+}
Index: gnu/classpath/jdwp/exception/InvalidThreadGroupException.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/gnu/classpath/jdwp/exception/InvalidThreadGroupException.java,v
retrieving revision 1.2
diff -u -p -r1.2 InvalidThreadGroupException.java
--- gnu/classpath/jdwp/exception/InvalidThreadGroupException.java       2 Jul 
2005 20:32:10 -0000       1.2
+++ gnu/classpath/jdwp/exception/InvalidThreadGroupException.java       20 Aug 
2005 18:51:51 -0000
@@ -53,11 +53,11 @@ public class InvalidThreadGroupException
   public InvalidThreadGroupException (long id)
   {
     super (JdwpConstants.Error.INVALID_THREAD_GROUP,
-          "invalid thread id (" + id + ")");
+          "invalid thread group id (" + id + ")");
   }
 
   public InvalidThreadGroupException (Throwable t)
   {
-    super (JdwpConstants.Error.INVALID_THREAD, t);
+    super (JdwpConstants.Error.INVALID_THREAD_GROUP, t);
   }
 }