checkin from browser
authorcg
Thu, 26 Aug 1999 10:16:16 +0000
changeset 600 78174752509d
parent 599 ba46813e7813
child 601 7e45fca24adf
checkin from browser
JavaUnresolvedFieldrefConstant.st
JavaVM.st
--- a/JavaUnresolvedFieldrefConstant.st	Wed Aug 25 14:34:23 1999 +0000
+++ b/JavaUnresolvedFieldrefConstant.st	Thu Aug 26 10:16:16 1999 +0000
@@ -99,6 +99,24 @@
     "Modified: / 8.1.1998 / 19:14:05 / cg"
 ! !
 
+!JavaUnresolvedFieldrefConstant methodsFor:'printing & storing'!
+
+displayString
+    |classOrClassRef className nameAndType fieldName|
+
+    classOrClassRef := (constantPool at:classIndex).
+    className := classOrClassRef fullName.
+
+    nameAndType := (constantPool at:nameandTypeIndex).
+    nameAndType isUnresolved ifTrue:[
+        nameAndType := nameAndType preResolve.
+    ].
+    fieldName := nameAndType name.
+    ^ (self class name) , '( idx= ' , constantPoolIndex printString , ' class= ' , className , ' field= ' , fieldName ,')'
+
+
+! !
+
 !JavaUnresolvedFieldrefConstant methodsFor:'resolving'!
 
 preResolve
@@ -127,10 +145,16 @@
 
     "Created: 15.4.1996 / 16:05:50 / cg"
     "Modified: 15.4.1996 / 16:26:44 / cg"
+!
+
+resolveStatic
+self halt.
+    ^ self
+
 ! !
 
 !JavaUnresolvedFieldrefConstant class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaUnresolvedFieldrefConstant.st,v 1.11 1998/11/16 15:16:34 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaUnresolvedFieldrefConstant.st,v 1.12 1999/08/26 10:14:54 cg Exp $'
 ! !
--- a/JavaVM.st	Wed Aug 25 14:34:23 1999 +0000
+++ b/JavaVM.st	Thu Aug 26 10:16:16 1999 +0000
@@ -1603,7 +1603,7 @@
     props at:'java.version'       put:'1'.
     props at:'java.vendor'        put:'eXept Software AG'.
     props at:'java.vendor.url'    put:'http://www.exept.de'.
-    props at:'java.home'          put:(self defaultJAVAHome).
+    props at:'java.home'          put:(self defaultJAVAHome asFilename pathName).
     props at:'java.class.version' put:'1'.
     props at:'java.class.path'    put:(self defaultCLASSPATH).
     props at:'os.name'            put:os.
@@ -2611,7 +2611,7 @@
         '' printCR.
     ].
     ExceptionDebug ifTrue:[
-        self halt:('JAVA: exception: ' , aJavaException class fullName).
+        self halt:('JAVA: exceptionDebug: ' , aJavaException class fullName).
 "/        self internalError:('JAVA: exception: ' , aJavaException class fullName).
     ].
 
@@ -12050,6 +12050,6 @@
 !JavaVM class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.159 1999/08/21 14:09:30 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaVM.st,v 1.160 1999/08/26 10:16:16 cg Exp $'
 ! !
 JavaVM initialize!