Mercurial Mercurial > hg > stx-libjava / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Mon, 18 Dec 2000 17:43:45 +0100
changeset 2095 6773680aeb85
parent 2094 4eb2e5b0f248
child 2096 7a9e43bc0792
*** empty log message ***
JavaDecompiler.st file | annotate | diff | comparison | revisions
JavaMethod.st file | annotate | diff | comparison | revisions
JavaVM.st file | annotate | diff | comparison | revisions 
--- a/JavaDecompiler.st	Mon Dec 18 16:43:46 2000 +0100
+++ b/JavaDecompiler.st	Mon Dec 18 17:43:45 2000 +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,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.
-"
 "{ Package: 'stx:libjava' }"
 
 Object subclass:#JavaDecompiler
@@ -47,19 +19,15 @@
 		accessedStaticVars modifiedStaticVars sentMessages'
 	classVariableNames:'DecoderTable'
 	poolDictionaries:''
-	category:'Languages-Java-Support-Decompiling'
+	category:'Java-Support-Decompiling'
 !
 
 !JavaDecompiler class methodsFor:'documentation'!
 
 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
@@ -67,34 +35,8 @@
  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.
-
-"
 !
 
 examples
@@ -675,80 +617,84 @@
     "Modified: / 5.12.1998 / 15:58:37 / cg"
 !
 
-methodDefinitionOf: m inPackage: pckgName on: s 
-    | aMethod nm  specComponents  accessAttributeStyle  codeStyle  methodNameStyle |
+methodDefinitionOf:m inPackage:pckgName on:s
+    |aMethod type nm specComponents accessAttributeStyle codeStyle methodNameStyle|
 
     aMethod := m.
-    m isWrapped ifTrue: [
+    m isWrapped ifTrue:[
         aMethod := m originalMethod
     ].
-    accessAttributeStyle := Java prettyPrintStyle at: #accessAttribute.
-    codeStyle := Java prettyPrintStyle at: #code.
-    methodNameStyle := Java prettyPrintStyle at: #methodName.
-    s nextPutAll: '    '.
-    s emphasis: accessAttributeStyle.
-    aMethod isPublic ifTrue: [
-        s nextPutAll: 'public '.
-    ] ifFalse: [
-        aMethod isProtected ifTrue: [
-            s nextPutAll: 'protected '.
-        ] ifFalse: [ s nextPutAll: 'private '. ]
+
+    accessAttributeStyle := Java prettyPrintStyle at:#accessAttribute.
+    codeStyle := Java prettyPrintStyle at:#code.
+    methodNameStyle := Java prettyPrintStyle at:#methodName.
+
+    s nextPutAll:'    '.
+    s emphasis:accessAttributeStyle.
+    aMethod isPublic ifTrue:[
+        s nextPutAll:'public '.
+    ] ifFalse:[
+        aMethod isProtected ifTrue:[
+            s nextPutAll:'protected '.
+        ] ifFalse:[
+            s nextPutAll:'private '.
+        ]
     ].
-    aMethod isFinal ifTrue: [
-        s nextPutAll: 'final '.
+    aMethod isFinal ifTrue:[
+        s nextPutAll:'final '.
     ].
-    aMethod isStatic ifTrue: [
-        s nextPutAll: 'static '.
+    aMethod isStatic ifTrue:[
+        s nextPutAll:'static '.
     ].
-    aMethod isNative ifTrue: [
-        s nextPutAll: 'native '.
+    aMethod isNative ifTrue:[
+        s nextPutAll:'native '.
     ].
-    aMethod isSynchronized ifTrue: [
-        s nextPutAll: 'synchronized '.
+    aMethod isSynchronized ifTrue:[
+        s nextPutAll:'synchronized '.
     ].
-    s emphasis: codeStyle.
-    (nm := aMethod name) = '<init>' ifTrue: [
+    s emphasis:codeStyle.
+
+    (nm := aMethod name) = '<init>' ifTrue:[
         nm := aMethod javaClass lastName.
     ].
-    specComponents := JavaMethod 
-                specComponentsWithArgsFromSignature: (aMethod instVarNamed:#descriptor)
-                withName: nm
-                in: (aMethod javaClass package).
-    s nextPutAll: (specComponents at: 1).
+    specComponents := JavaMethod
+                          specComponentsWithArgsFromSignature:(aMethod signature)
+                          withName:nm 
+                          in:(aMethod javaClass package).
+
+    s nextPutAll:(specComponents at:1).
     s space.
-    s emphasis: methodNameStyle.
-    s nextPutAll: (specComponents at: 2).
-    s emphasis: codeStyle.
-    s nextPutAll: ' ('.
-    s nextPutAll: (specComponents at: 3).
-    s nextPutAll: ')'.
-    aMethod exceptionTable size > 0 ifTrue: [
-        s nextPutAll: ' throws '.
-        aMethod exceptionTable 
-            keysAndValuesDo: [
-                :index :aClassRef | 
-                | nm |
+    s emphasis:methodNameStyle.
+    s nextPutAll:(specComponents at:2).
+    s emphasis:codeStyle.
+    s nextPutAll:' ('.
+    s nextPutAll:(specComponents at:3).
+    s nextPutAll:')'.
+
+    aMethod exceptionTable size > 0 ifTrue:[
+        s nextPutAll:' throws '.
 
-                nm := aClassRef name.
-                (nm startsWith: pckgName) ifTrue: [
-                    nm := nm copyFrom: pckgName size + 2
-                ] ifFalse: [
-                    (nm startsWith: 'java/lang') ifTrue: [
-                        nm := nm copyFrom: 'java/lang' size + 2.
-                    ].
+        aMethod exceptionTable keysAndValuesDo:[:index :aClassRef |
+            |nm|
+
+            nm := aClassRef fullName.
+            (nm startsWith:pckgName) ifTrue:[
+                nm := nm copyFrom:pckgName size + 2
+            ] ifFalse:[
+                (nm startsWith:'java/lang') ifTrue:[
+                   nm := nm copyFrom:'java/lang' size + 2.
                 ].
-                index ~~ 1 ifTrue: [ s nextPutAll: ', ' ].
-                s nextPutAll: (nm copyReplaceAll: $/ with: $.)
-            ]
+            ].
+            index ~~ 1 ifTrue:[
+                s nextPutAll:', '
+            ].
+            s nextPutAll:(nm copyReplaceAll:$/ with:$.)
+        ]
     ].
-    s
-        nextPutAll: ';';
-        cr.
+    s nextPutAll:';'; cr.
 
-    "Created: / 01-08-1997 / 12:24:11 / cg"
-    "Modified: / 14-11-1998 / 00:03:09 / cg"
-    "Modified: / 04-06-2011 / 17:18:56 / Marcel Hlopko <hlopkmar@fel.cvut.cz>"
-    "Modified: / 15-08-2011 / 08:52:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Created: / 1.8.1997 / 12:24:11 / cg"
+    "Modified: / 14.11.1998 / 00:03:09 / cg"
 ! !
 
 !JavaDecompiler class methodsFor:'decompiling'!
@@ -1298,11 +1244,6 @@
 !JavaDecompiler class methodsFor:'documentation'!
 
 version
-    ^ '$Id: JavaDecompiler.st,v 1.50 2011/08/18 18:42:48 vrany Exp $'
-!
-
-version_SVN
-    ^ '$Id: JavaDecompiler.st,v 1.50 2011/08/18 18:42:48 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaDecompiler.st,v 1.48 2000-12-18 16:43:45 cg Exp $'
 ! !
-
-JavaDecompiler initialize!
\ No newline at end of file
+JavaDecompiler initialize!
--- a/JavaMethod.st	Mon Dec 18 16:43:46 2000 +0100
+++ b/JavaMethod.st	Mon Dec 18 17:43:45 2000 +0100
@@ -1301,6 +1301,12 @@
                 aStream cr.
                 aStream nextPutAll:ex suspendedContext sender sender sender sender sender printString.
                 aStream cr.
+                aStream nextPutAll:ex suspendedContext sender sender sender sender sender sender printString.
+                aStream cr.
+                aStream nextPutAll:ex suspendedContext sender sender sender sender sender sender sender printString.
+                aStream cr.
+                aStream nextPutAll:ex suspendedContext sender sender sender sender sender sender sender sender printString.
+                aStream cr.
 
                 JavaDecompiler isNil ifTrue:[
                     aStream nextPutAll:'// Sorry - no decompiler'
@@ -1903,6 +1909,6 @@
 !JavaMethod class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaMethod.st,v 1.101 2000-12-18 15:10:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaMethod.st,v 1.102 2000-12-18 16:43:32 cg Exp $'
 ! !
 JavaMethod initialize!
--- a/JavaVM.st	Mon Dec 18 16:43:46 2000 +0100
+++ b/JavaVM.st	Mon Dec 18 17:43:45 2000 +0100
@@ -1546,29 +1546,32 @@
      being already loaded. (used with jdk < 1.2)"
 
     LibPath := #(
-			'__builtIn__' 
-			'/usr/local/lib' 
-			'/usr/local/lib/java'
-		).
+                        '__builtIn__' 
+                        '/usr/local/lib' 
+                        '/usr/local/lib/java'
+                ).
 
     SimulatedLibs := #(
-			'__builtIn__/net' 
-			'__builtIn__/awt' 
-			'__builtIn__/tawt' 
-			'__builtIn__/winawt' 
-			'__builtIn__/jpeg'
-			'__builtIn__/mmedia'
-			'__builtIn__/zip'
-			'__builtIn__/math'
-			'__builtIn__/sysresource'
-
-			"/ KAVA ... 
-			'__builtIn__/agent'
-
-			"/ MS-java ... 
-			'__builtIn__/msawt'
-			'__builtIn__/javart'
-		      ).
+                        '__builtIn__/net' 
+                        '__builtIn__/awt' 
+                        '__builtIn__/tawt' 
+                        '__builtIn__/winawt' 
+                        '__builtIn__/jpeg'
+                        '__builtIn__/mmedia'
+                        '__builtIn__/zip'
+                        '__builtIn__/math'
+                        '__builtIn__/sysresource'
+
+                        "/ KAVA ... 
+                        '__builtIn__/agent'
+
+                        "/ MS-java ... 
+                        '__builtIn__/msawt'
+                        '__builtIn__/javart'
+
+                        "/ 1.1.8
+                        '__builtIn__/jpeg_sun' 
+                      ).
 
     "
      self initializeSimulatedLibs
@@ -1583,10 +1586,10 @@
      being already loaded (used with jdk >= 1.2)"
 
     SimulatedNativeLibs := #(
-			     '/libawt.so' 
-			     '/libnet.so' 
-			     '/libcmm.so' 
-			    ).
+                             '/libawt.so' 
+                             '/libnet.so' 
+                             '/libcmm.so' 
+                            ).
 
     "
      self initializeSimulatedNativeLibs
@@ -1622,6 +1625,7 @@
     props at:'os.arch'            put:cpu.
     props at:'os.version'         put:'1'.
     props at:'file.separator'     put:(Filename separator asString).
+
     props at:'path.separator'     put:':'.
     props at:'line.separator'     put:(Character cr asString).
     props at:'user.name'          put:(OperatingSystem getLoginName).
@@ -1633,8 +1637,10 @@
 
     props at:'hotjava.home'       put:(self defaultHotJavaHome).
 
+    "/ new with jdk 1.1.8
     "/ undocumented ?
-    props at:'file.encoding.pkg'  put:'sun.io'.
+    props at:'file.encoding.pkg'    put:'sun.io'.
+    props at:'file.encoding'        put:'8859_1'.
 
     "/ suppress copyright view in appletViewer ...
     props at:'appletviewer.version' put:'1.1'.
@@ -12689,6 +12695,6 @@
 !JavaVM class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libjava/JavaVM.st,v 1.176 2000-12-18 15:29:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libjava/JavaVM.st,v 1.177 2000-12-18 16:43:17 cg Exp $'
 ! !
 JavaVM initialize!
hg/stx-libjava