--- a/Java.st	Tue Nov 17 19:21:10 1998 +0000
+++ b/Java.st	Wed Nov 18 15:37:49 1998 +0000
@@ -291,7 +291,7 @@
 initialize
     |tryJDK1_2 tryJDK1_16 tryJDK1_15 tryJDK1_13 tryJDK1_11 tryJDK1_103 directoriesToSearch 
      jHome jClasses jSources mozillaHome tryNetscape4_0
-     tryMS tryBorland tryVA|
+     tryMS tryBorland tryVA fn|
 
     FailedToLoadClasses := nil.
 
@@ -307,6 +307,13 @@
     tryJDK1_11 := true.
     tryJDK1_103 := false.
 
+"/    tryBorland := false.
+"/    tryJDK1_16 := false.
+"/    tryJDK1_15 := false.
+"/    tryJDK1_13 := false.
+"/    tryJDK1_11 := false.
+"/    tryMS := true.
+
     ExcludedClassPath := OrderedCollection new.
 
     directoriesToSearch := OrderedCollection new.
@@ -317,23 +324,32 @@
     tryBorland ifTrue:[        
         directoriesToSearch add:'c:\jbuilder2\java'.
     ].
+
     tryMS ifTrue:[        
-        directoriesToSearch add:'c:\windows\java\classes'.
-        'c:\windows\java\packages' asFilename exists ifTrue:[
-            'c:\windows\java\packages' asFilename directoryContents do:[:f |
+"/        (fn := 'c:\windows\java\classes' asFilename) exists ifTrue:[
+"/            directoriesToSearch add:'c:\windows\java\classes'.
+"/            fn directoryContents do:[:f |
+"/                (f asFilename hasSuffix:'zip') ifTrue:[
+"/                    directoriesToSearch add:(fn construct:f) pathName                    
+"/                ]
+"/            ]
+"/        ].
+        (fn := 'c:\windows\java\packages' asFilename) exists ifTrue:[
+            fn directoryContents do:[:f |
                 (f asFilename hasSuffix:'zip') ifTrue:[
-                    directoriesToSearch add:('c:\windows\java\packages' asFilename construct:f) pathName                    
+                    directoriesToSearch add:(fn construct:f) pathName                    
                 ]
             ]
         ].
-        'c:\windows\java\trustlib' asFilename exists ifTrue:[
-            'c:\windows\java\trustlib' asFilename directoryContents do:[:f |
+        (fn := 'c:\windows\java\trustlib' asFilename) exists ifTrue:[
+            fn directoryContents do:[:f |
                 (f asFilename hasSuffix:'zip') ifTrue:[
-                    directoriesToSearch add:('c:\windows\java\trustlib' asFilename construct:f) pathName                    
+                    directoriesToSearch add:(fn construct:f) pathName                    
                 ]
             ]
         ]
     ].
+
     tryJDK1_2 ifTrue:[        
         directoriesToSearch addAll:
                                 #(
@@ -346,6 +362,7 @@
                                     'c:\java\jdk1.2'
                                 )
     ].
+
     tryJDK1_16 ifTrue:[
         directoriesToSearch addAll:
                                 #(
@@ -363,6 +380,7 @@
                                     'c:\java\jdk1.1.6'
                                 ) 
     ].
+
     tryJDK1_15 ifTrue:[        
         directoriesToSearch addAll:
                                 #(
@@ -380,6 +398,7 @@
                                     'c:\java\jdk1.1.5'
                                 )
     ].
+
     tryJDK1_13 ifTrue:[        
         directoriesToSearch addAll:
                                 #(
@@ -397,6 +416,7 @@
                                     'c:\java\jdk1.1.3'
                                 )
     ].
+
     tryJDK1_11 ifTrue:[        
         directoriesToSearch addAll:
                                 #(
@@ -414,6 +434,7 @@
                                     'c:\java\jdk1.1.1'
                                 )
     ].
+
     tryJDK1_103 ifTrue:[        
         directoriesToSearch addAll:
                                 #(
@@ -432,6 +453,8 @@
                                 )
     ].
 
+    jClasses := OrderedCollection new.
+
     directoriesToSearch do:[:aPath | 
         |dir libDir|
 
@@ -439,7 +462,7 @@
         (jHome isNil and:[dir exists]) ifTrue:[
             ((dir hasSuffix:'jar')
             or:[dir hasSuffix:'zip']) ifTrue:[
-                jClasses := dir.
+                jClasses add:dir.
             ] ifFalse:[
 
                 "/ there must be either a classes directory,
@@ -447,12 +470,12 @@
                 (libDir := dir construct:'lib') exists ifTrue:[
                     (libDir construct:'classes.zip') exists ifTrue:[
                         jHome := aPath.
-                        jClasses := libDir construct:'classes.zip'.
+                        jClasses add:(libDir constructString:'classes.zip').
                     ] ifFalse:[
                         (libDir construct:'classes') exists ifTrue:[
                             (libDir construct:'classes') isDirectory ifTrue:[
                                 jHome := aPath.
-                                jClasses := libDir construct:'classes'.
+                                jClasses add:(libDir construct:'classes').
                             ]
                         ]
                     ]
@@ -460,28 +483,29 @@
             ].
         ].
     ].
-    jHome isNil ifTrue:[
-        Transcript showCR:'no java home directory found'.
-        ^ self
-    ].
-    Transcript showCR:'Found javaHome in: ' , jHome.
 
     self javaHome:jHome.
-    self classPath:(Array with:jClasses pathName).
+    self classPath:jClasses.
 
-    (jSources := jHome asFilename construct:'source') exists ifFalse:[
-        (jSources := jHome asFilename construct:'src') exists ifFalse:[
-            (jSources := jHome asFilename construct:'sources') exists ifFalse:[
-                jSources := nil.
+    jHome isNil ifTrue:[
+        Transcript showCR:'no java home directory found'.
+    ] ifFalse:[
+        Transcript showCR:'Found javaHome in: ' , jHome.
+
+        (jSources := jHome asFilename construct:'source') exists ifFalse:[
+            (jSources := jHome asFilename construct:'src') exists ifFalse:[
+                (jSources := jHome asFilename construct:'sources') exists ifFalse:[
+                    jSources := nil.
+                ]
             ]
-        ]
-    ].
+        ].
 
-    jSources isNil ifTrue:[
-        Transcript showCR:'no java source directory found'.
-    ] ifFalse:[
-        Transcript showCR:'Found javaSources in: ' , jSources pathName.
-        self sourceDirectories:(Array with:jSources pathName).
+        jSources isNil ifTrue:[
+            Transcript showCR:'no java source directory found'.
+        ] ifFalse:[
+            Transcript showCR:'Found javaSources in: ' , jSources pathName.
+            self sourceDirectories:(Array with:jSources pathName).
+        ].
     ].
 
     directoriesToSearch := OrderedCollection new.
@@ -534,7 +558,7 @@
      JavaVM initializeVM
     "
 
-    "Modified: / 4.11.1998 / 19:55:58 / cg"
+    "Modified: / 18.11.1998 / 01:30:55 / cg"
 !
 
 initializePrettyPrintStyle
@@ -615,8 +639,12 @@
         JavaVM initializeVM.
 
     ] ifFalse:[
-        'JAVA [info]: re-initializing JAVA classes ...' infoPrintCR.
-        JavaVM reinitializeVM.
+        (JavaEventThread isNil or:[JavaEventThread isDead]) ifTrue:[
+            JavaVM initializeVM
+"/        ] ifFalse:[
+"/          'JAVA [info]: re-initializing JAVA classes ...' infoPrintCR.
+"/          JavaVM reinitializeVM.
+        ].
     ].    
     'JAVA [info]: done JAVA initialization.' infoPrintCR.
 
@@ -624,7 +652,7 @@
      Java startupJavaSystem
     "
 
-    "Modified: / 12.11.1998 / 15:35:38 / cg"
+    "Modified: / 17.11.1998 / 21:43:27 / cg"
 !
 
 terminateAllThreads
@@ -1339,6 +1367,6 @@
 !Java class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.80 1998/11/16 15:14:40 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.81 1998/11/18 15:35:24 cg Exp $'
 ! !
 Java initialize!