--- a/src/Java.st	Thu Aug 16 12:48:04 2012 +0000
+++ b/src/Java.st	Thu Aug 16 17:08:40 2012 +0000
@@ -22,11 +22,12 @@
 
 Object subclass:#Java
 	instanceVariableNames:''
-	classVariableNames:'Classes UnresolvedClassRefs Release ClassPath ClassPathExt
-		SourceDirectories CacheDirectory JavaHome InternedStrings
-		Java_lang_String Java_lang_Class PrettyPrintStyle
-		LastArgumentString Threads ExcludedClassPath FailedToLoadClasses
-		SourceCache SourceArchiveCache JavaClassLoaderQuerySignal
+	classVariableNames:'Classes UnresolvedClassRefs Release ClassPath ClassPathPackages
+		ClassPathExt SourceDirectories SourceDirectoriesPackages
+		CacheDirectory JavaHome InternedStrings Java_lang_String
+		Java_lang_Class PrettyPrintStyle LastArgumentString Threads
+		ExcludedClassPath FailedToLoadClasses SourceCache
+		SourceArchiveCache JavaClassLoaderQuerySignal
 		ClassLoaderQuerySignal ThreadsAccess'
 	poolDictionaries:''
 	category:'Languages-Java-Support'
@@ -374,13 +375,13 @@
 
 classPathFromPackages
 
-    | cp |
-
-    cp := OrderedCollection new.
-    ProjectDefinition allSubclassesDo:[:pkg|
-        self addToPath: cp path: pkg javaClassPath origin: JavaPathElement originPackage
+    ClassPathPackages isNil ifTrue:[
+        ClassPathPackages := OrderedCollection new.
+        ProjectDefinition allSubclassesDo:[:pkg|
+            self addToPath: ClassPathPackages path: pkg javaClassPath origin: JavaPathElement originPackage
+        ].
     ].
-    ^cp.
+    ^ClassPathPackages
 
 
     "
@@ -567,17 +568,17 @@
 
 sourcePathFromPackages
 
-    | sp |
-
-    sp := OrderedCollection new.
-    ProjectDefinition allSubclassesDo:[:pkg|
-        self addToPath: sp path: pkg javaSourcePath origin: JavaPathElement originPackage
+    SourceDirectoriesPackages isNil ifTrue:[
+        SourceDirectoriesPackages := OrderedCollection new.
+        ProjectDefinition allSubclassesDo:[:pkg|
+            self addToPath: SourceDirectoriesPackages path: pkg javaSourcePath origin: JavaPathElement originPackage
+        ].
     ].
-    ^sp.
+    ^SourceDirectoriesPackages.
 
 
     "
-        Java classPathFromPackages
+        Java sourcePathFromPackages
     "
 
     "Created: / 07-02-1997 / 19:23:45 / cg"