--- a/Java.st	Thu Sep 10 15:13:49 1998 +0000
+++ b/Java.st	Sat Sep 12 15:30:04 1998 +0000
@@ -274,6 +274,7 @@
         directoriesToSearch add:'/usr/java/jdk1.2'.
         directoriesToSearch add:'/usr/jdk1.2'.
         directoriesToSearch add:'c:\jdk1.2'.
+        directoriesToSearch add:'c:\java\jdk1.2'.
     ].
     tryJDK1_15 ifTrue:[        
         directoriesToSearch add:'/usr/local/java/jdk115'.
@@ -286,6 +287,7 @@
         directoriesToSearch add:'/usr/jdk1.1.5'.
         directoriesToSearch add:'c:\jdk115'.
         directoriesToSearch add:'c:\jdk1.1.5'.
+        directoriesToSearch add:'c:\java\jdk1.1.5'.
     ].
     tryJDK1_13 ifTrue:[        
         directoriesToSearch add:'/usr/local/java/jdk113'.
@@ -298,6 +300,7 @@
         directoriesToSearch add:'/usr/jdk1.1.3'.
         directoriesToSearch add:'c:\jdk113'.
         directoriesToSearch add:'c:\jdk1.1.3'.
+        directoriesToSearch add:'c:\java\jdk1.1.3'.
     ].
     directoriesToSearch add:'/usr/local/java/jdk111'.
     directoriesToSearch add:'/usr/local/java/jdk1.1.1'.
@@ -309,6 +312,7 @@
     directoriesToSearch add:'/usr/jdk1.1.1'.
     directoriesToSearch add:'c:\jdk111'.
     directoriesToSearch add:'c:\jdk1.1.1'.
+    directoriesToSearch add:'c:\java\jdk1.1.1'.
 
     directoriesToSearch do:[:aPath | 
         |dir libDir|
@@ -356,14 +360,24 @@
         self sourceDirectories:(Array with:jSources pathName).
     ].
 
-    mozillaHome := '/usr/local/java/moz3_0/lib_unix'.
-    mozillaHome asFilename exists ifTrue:[
-        Java addToClassPath:(mozillaHome , '/classes').
-        "/
-        "/ care to only load mozilla classes from there ...
-        "/
-        ExcludedClassPath add:(mozillaHome , '/classes/java/').
-        ExcludedClassPath add:(mozillaHome , '/classes/sun/').
+    directoriesToSearch := OrderedCollection new.
+    directoriesToSearch add:'/usr/local/java/moz3_0/lib_unix'.
+
+    directoriesToSearch do:[:aPath |
+        |dir classDir|
+
+        dir := aPath asFilename.
+        (mozillaHome isNil and:[dir exists]) ifTrue:[
+            mozillaHome := dir.
+            classDir := (dir construct:'classes').
+            Java addToClassPath:classDir pathName.
+            "/
+            "/ care to only load mozilla classes from there ...
+            "/ i.e. ignore the java/sun stuff found there.
+            "/
+            ExcludedClassPath add:(classDir construct:'java') pathName.
+            ExcludedClassPath add:(classDir construct:'sun') pathName.
+        ]
     ].
     self initializePrettyPrintStyle.
 
@@ -372,7 +386,7 @@
      JavaVM initializeVM
     "
 
-    "Modified: / 10.9.1998 / 14:56:20 / cg"
+    "Modified: / 12.9.1998 / 16:44:48 / cg"
 !
 
 initializePrettyPrintStyle
@@ -1151,6 +1165,6 @@
 !Java class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.66 1998/09/10 14:33:08 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.67 1998/09/12 15:30:04 cg Exp $'
 ! !
 Java initialize!