checkin from browser
authorcg
Sat, 25 Sep 1999 19:33:53 +0000
changeset 605 537f1988b780
parent 604 7eeafecf10ed
child 606 24dc349db904
checkin from browser
Java.st
--- a/Java.st	Sat Sep 25 14:37:57 1999 +0000
+++ b/Java.st	Sat Sep 25 19:33:53 1999 +0000
@@ -528,6 +528,7 @@
 
     directoriesToSearch := OrderedCollection new.
     directoriesToSearch add:'/usr/local/java/moz3_0/lib_unix'.
+    directoriesToSearch add:'..\..\..\cg\java\java\ns30_unix.zip'.
 
     tryVA == true ifTrue:[        
         directoriesToSearch add:'C:\IBMVJava\EAB\bdk'.
@@ -552,14 +553,19 @@
         |dir classDir|
 
         dir := aPath asFilename.
-        (mozillaHome isNil and:[dir exists]) ifTrue:[
+        (dir exists) ifTrue:[
             ((dir hasSuffix:'jar') 
             or:[dir hasSuffix:'zip']) ifTrue:[
+                Transcript showCR:'Adding to classPath: ' , dir pathName.
                 Java addToClassPath:dir.
             ] ifFalse:[
                 mozillaHome := dir.
                 classDir := (dir construct:'classes').
-                Java addToClassPath:classDir pathName.
+                classDir exists ifTrue:[
+                    Transcript showCR:'Adding to classPath: ' , classDir pathName.
+                    Java addToClassPath:classDir pathName.
+                ].
+
                 "/
                 "/ care to only load mozilla classes from there ...
                 "/ i.e. ignore the java/sun stuff found there.
@@ -576,7 +582,7 @@
      JavaVM initializeVM
     "
 
-    "Modified: / 25.9.1999 / 16:09:00 / cg"
+    "Modified: / 25.9.1999 / 21:33:45 / cg"
 !
 
 initializePrettyPrintStyle
@@ -1409,6 +1415,6 @@
 !Java class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.106 1999/09/25 14:37:57 cg Exp $'
+    ^ '$Header: /home/jv/Projects/SmalltalkX/repositories/cvs/stx/libjava/Java.st,v 1.107 1999/09/25 19:33:53 cg Exp $'
 ! !
 Java initialize!