# HG changeset patch # User Stefan Vogel # Date 1555000586 -7200 # Node ID d8c5eadc3a52ccea9f1c6fd5e926730a6e1498f2 # Parent 521f13dede36eb8a78a3cda8e06e5506e1499ff9 #REFACTORING by stefan class: JavaVM class changed: #loadClassesIn:matching: use \"asFilename pathName\" instead of \"asFilename asAbsoluteFilename pathName\" ist is equivalent! diff -r 521f13dede36 -r d8c5eadc3a52 JavaVM.st --- a/JavaVM.st Thu Apr 11 18:35:48 2019 +0200 +++ b/JavaVM.st Thu Apr 11 18:36:26 2019 +0200 @@ -2766,16 +2766,16 @@ Returns a set of loaded classes." | dir dirString className loadedClasses | - dir := directory asFilename asAbsoluteFilename. + + dir := directory asFilename. loadedClasses := Set new. Java addToClassPath: dir pathName. JavaClassReader classLoaderQuerySignal answer: SystemClassLoader do:[ dir isDirectory ifTrue:[ - dir recursiveDirectoryContentsAsFilenamesDo: [ - :filename | - (filename isRegularFile and: [ filename suffix = #class ]) ifTrue: [ + dir recursiveDirectoryContentsAsFilenamesDo:[:eachFilename| + (eachFilename isRegularFile and: [ eachFilename suffix = #class ]) ifTrue: [ dirString := dir pathName. - className := filename withoutSuffix pathName. + className := eachFilename withoutSuffix pathName. className := className subString: dirString size + 2 to: className size. className := className replaceAll: (Filename separator) with: $.. (pattern isNil or:[className matches: pattern]) ifTrue: [ @@ -2788,7 +2788,7 @@ ] ifFalse:[ | zar | - zar := ZipArchive oldFileNamed: dir pathName. + zar := ZipArchive oldFileNamed:dir. zar entries do:[:entry| (entry endsWith:'.class') ifTrue:[ | nm | @@ -2808,6 +2808,7 @@ "Modified: / 21-10-2011 / 12:52:06 / Marcel Hlopko " "Modified: / 27-05-2014 / 12:20:24 / Jan Vrany " + "Modified: / 11-04-2019 / 18:19:50 / Stefan Vogel" ! ! !JavaVM class methodsFor:'class loading/unloading'!