--- a/JavaContext.st	Sat Aug 29 15:38:13 1998 +0000
+++ b/JavaContext.st	Thu Sep 10 12:58:07 1998 +0000
@@ -61,8 +61,8 @@
 
     n := self numArgs + self numVars.
     n == 0 ifTrue:[
-        "/ little optimization here - avoid creating empty containers
-        ^ #()
+	"/ little optimization here - avoid creating empty containers
+	^ #()
     ].
     ^ (Array new:n) replaceFrom:1 to:n with:self startingAt:(self arg1Index).
 
@@ -77,22 +77,22 @@
 
 "/ 'ask line for pc:' print. pc printCR.
     pc isNil ifTrue:[
-        nr := self lineNumberFromMethod.
-        nr notNil ifTrue:[
-            ^ nr
-        ].
-        " '-> 0 [a]' printCR. " 
-        ^0
+	nr := self lineNumberFromMethod.
+	nr notNil ifTrue:[
+	    ^ nr
+	].
+	" '-> 0 [a]' printCR. " 
+	^0
     ].
 
     nr := self method lineNumberForPC:pc.
     nr isNil ifTrue:[
-        nr := self lineNumberFromMethod.
-        nr notNil ifTrue:[
-            ^ nr
-        ].
-        " '-> 0 [b]' printCR. " 
-        ^ 0
+	nr := self lineNumberFromMethod.
+	nr notNil ifTrue:[
+	    ^ nr
+	].
+	" '-> 0 [b]' printCR. " 
+	^ 0
     ].
 "/ '-> ' print. nr printCR.
      ^ nr.
@@ -215,8 +215,8 @@
 
     n := self size - nSkipped.
     n == 0 ifTrue:[
-        "/ little optimization here - avaoid creating empty containers
-        ^ #()
+	"/ little optimization here - avaoid creating empty containers
+	^ #()
     ].
 
     ^ (Array new:n) replaceFrom:1 to:n with:self startingAt:nSkipped+1.
@@ -232,8 +232,8 @@
 
     mySize := self numVars.
     mySize == 0 ifTrue:[
-        "/ little optimization here - avaoid creating empty containers
-        ^ #()
+	"/ little optimization here - avaoid creating empty containers
+	^ #()
     ].
     nonVars := (self arg1Index-1) + self numArgs.
     ^ (Array new:mySize) replaceFrom:1 to:mySize with:self startingAt:nonVars+1
@@ -255,9 +255,11 @@
      from the beginning (when the context is restarted).
      - a highly internal mechanism and not for public use."
 
-%{  /* NOCONTEXT */
-     __INST(flags) = (OBJ)((INT)__INST(flags) | __MASKSMALLINT(__JAVA_EX_PEND));
-%}
+    flags := flags bitOr:16r08000000.
+
+"/ %{  /* NOCONTEXT */
+"/      __INST(flags) = (OBJ)((INT)__INST(flags) | __MASKSMALLINT(__JAVA_EX_PEND));
+"/ %}
 
     "Modified: 13.12.1995 / 19:05:22 / cg"
 ! !
@@ -269,16 +271,16 @@
 
     |receiverClass receiverClassName newString implementorClass|
 
-%{
-    /*
-     * special handling for (invalid) free objects.
-     * these only appear if some primitiveCode does not correctly use SEND macros,
-     * which may lead to sends to free objects. In normal operation, this 'cannot' happen.
-     */ 
-    if (__isNonNilObject(__INST(receiver)) && (__qClass(__INST(receiver))==nil)) {
-	receiverClassName = __MKSTRING("FreeObject");
-    }
-%}.
+"/ %{
+"/     /*
+"/      * special handling for (invalid) free objects.
+"/      * these only appear if some primitiveCode does not correctly use SEND macros,
+"/      * which may lead to sends to free objects. In normal operation, this 'cannot' happen.
+"/      */ 
+"/     if (__isNonNilObject(__INST(receiver)) && (__qClass(__INST(receiver))==nil)) {
+"/         receiverClassName = __MKSTRING("FreeObject");
+"/     }
+"/ %}.
     receiverClassName notNil ifTrue:[^ receiverClassName].
 
     receiverClass := receiver class.
@@ -349,5 +351,5 @@
 !JavaContext class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaContext.st,v 1.23 1998/05/08 19:30:56 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/JavaContext.st,v 1.24 1998/09/10 12:58:06 cg Exp $'
 ! !

--- a/loadAll	Sat Aug 29 15:38:13 1998 +0000
+++ b/loadAll	Thu Sep 10 12:58:07 1998 +0000
@@ -1,3 +1,4 @@
+Smalltalk fileIn:'JavaVM.st'.
 Smalltalk fileIn:'Java.st'.
 Smalltalk fileIn:'JavaVM.st'.
 
@@ -73,55 +74,3 @@
 Smalltalk fileIn:'JavaView.st'.
 Smalltalk fileIn:'JavaEmbeddedFrameView.st'.
 
-!
-"/ self halt.
-Java flushClasses. 
-!
-
-|javaHome|
-
-"/
-"/ need jdk1.13 & moz in classPath
-"/
-
-"/ works
-javaHome := '/usr/local/java/jdk113beta'.
-
-"/ experimental
-javaHome := '/usr/local/java/jdk113'.
-
-(javaHome asFilename exists 
-and:[(javaHome asFilename construct:'lib/classes') exists]) ifFalse:[
-    javaHome := '/usr/local/java'.
-    (javaHome asFilename exists 
-    and:[(javaHome asFilename construct:'lib/classes') exists]) ifFalse:[
-	javaHome := '/usr/lib/java'.
-	[javaHome size <= 0 
-	 or:[javaHome asFilename exists
-	     and:[(javaHome asFilename construct:'lib/classes') exists]]] whileFalse:[
-	    javaHome := Dialog request:'what is the home of your java installation\\(Must contain the subdirs ''lib/classes'' and ''src'')' withCRs
-			       initialAnswer:javaHome.
-	].
-    ].
-].
-
-javaHome size > 0 ifTrue:[
-    Java javaHome:javaHome.
-    (javaHome asFilename construct:'lib/classes') exists ifTrue:[
-	Java classPath:(Array with:(javaHome , '/lib/classes')).
-	Java sourceDirectories:(Array with:(javaHome , '/src')).
-    ] ifFalse:[
-	Java classPath:(Array with:(javaHome)).
-	Java sourceDirectories:(Array with:(javaHome)).
-    ].
-
-    Java addToClassPath:'/usr/local/java/moz3_0/lib_unix/classes'.
-
-    "/ JavaClassReader loadClass:'java/util/Stack'. 
-    JavaClassReader loadClass:'sun.tools.javac.Main'. 
-    JavaClassReader loadClass:'sun.applet.AppletViewer'. 
-    JavaClassReader loadClass:'java/rmi/server/RemoteServer'. 
-    JavaClassReader loadClass:'netscape.applet.EmbeddedAppletFrame'. 
-    JavaBrowser open
-]
-!