Mercurial Mercurial > hg > stx-libjava / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
JavaExceptionTableEntry.st
changeset 2108 ca8c4e7db2e8
parent 749 e898eaeff091
child 2151 c0b6570c6f9b 
--- a/JavaExceptionTableEntry.st	Fri Nov 22 21:09:21 2002 +0100
+++ b/JavaExceptionTableEntry.st	Fri Nov 22 21:14:07 2002 +0100
@@ -1,10 +1,6 @@
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -12,33 +8,10 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
 
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-"
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaExceptionTableEntry
@@ -52,12 +25,8 @@
 
 copyright
 "
- COPYRIGHT (c) 1996-2011 by Claus Gittinger
- COPYRIGHT (c) 2010-2011 by Jan Vrany, Jan Kurs and Marcel Hlopko
-                            SWING Research Group, Czech Technical University in Prague
-
- Parts of the code written by Claus Gittinger are under following
- license:
+ COPYRIGHT (c) 1997 by eXept Software AG
+              All Rights Reserved
 
  This software is furnished under a license and may be used
  only in accordance with the terms of that license and with the
@@ -65,34 +34,9 @@
  be provided or otherwise made available to, or used by, any
  other person.  No title to or ownership of the software is
  hereby transferred.
-
- Parts of the code written at SWING Reasearch Group [1] are MIT licensed:
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation
- files (the 'Software'), to deal in the Software without
- restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following
- conditions:
+"
 
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
 
- THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
- OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
- OTHER DEALINGS IN THE SOFTWARE.
-
- [1] Code written at SWING Research Group contain a signature
-     of one of the above copright owners.
-
-"
 ! !
 
 !JavaExceptionTableEntry class methodsFor:'instance creation'!
@@ -146,18 +90,6 @@
                                   handlerPC printString , ')'
 
     "Modified: 15.8.1997 / 03:33:51 / cg"
-!
-
-printOn: aStream
-    super printOn: aStream.
-    aStream nextPut:$(.
-    catchType printOn: aStream.
-    aStream nextPutAll:' in ' , startPC printString , '..' ,
-                                  endPC printString , '->' ,
-                                  handlerPC printString , ')'
-
-    "Modified: / 15-08-1997 / 03:33:51 / cg"
-    "Created: / 25-02-2011 / 09:08:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !JavaExceptionTableEntry methodsFor:'private accessing'!
@@ -167,25 +99,14 @@
      return the handler-PC; otherwise, return nil."
 
     |cls|
-    "JV+MH@2011-02-25: You may wonder why there is endPC - 1:
-    The Java VM Spec, 3rd edition, sec 4.7.3, page 78:
 
-    The fact that end_pc is exclusive is a historical mistake in the design of the
-    Java virtual machine: if the Java virtual machine code for a method is exactly
-    65535 bytes long and ends with an instruction that is 1 byte long, then that
-    instruction cannot be protected by an exception handler. A compiler writer can
-    work around this bug by limiting the maximum size of the generated Java
-    virtual machine code for any method, instance initialization method, or static
-    initializer (the size of any code array) to 65534 bytes.
-
-    "
-
-    (pc between:startPC and:endPC - 1) ifTrue:[
+    (pc between:startPC and:endPC) ifTrue:[
         (catchType == 0) ifTrue:[^ handlerPC].
         (catchType isNil) ifTrue:[^ handlerPC].
         cls := aMethod javaClass.
-        catchType := catchType javaClass.
-
+        catchType isUnresolved ifTrue:[
+            catchType := catchType preResolve.
+        ].
         (catchType isKindOf:JavaClass) ifFalse:[
             self halt.
             ^ nil
@@ -197,8 +118,7 @@
     ].
     ^ nil
 
-    "Modified: / 07-01-1998 / 15:30:14 / cg"
-    "Modified: / 31-05-2011 / 09:53:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 7.1.1998 / 15:30:14 / cg"
 !
 
 startPC:start_pc endPC:end_pc handlerPC:handler_pc catchType:catch_type
@@ -213,9 +133,5 @@
 !JavaExceptionTableEntry class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaExceptionTableEntry.st,v 1.16 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaExceptionTableEntry.st,v 1.16 2011/08/18 18:42:48 vrany Exp $'
-! !
\ No newline at end of file
+    ^ '$Header: /cvs/stx/stx/libjava/JavaExceptionTableEntry.st,v 1.15 2002-11-22 20:12:59 cg Exp $'
+! !
hg/stx-libjava