--- a/loadClasses	Wed Dec 23 19:28:03 1998 +0000
+++ b/loadClasses	Tue Dec 29 16:50:12 1998 +0000
@@ -2,55 +2,61 @@
 "/ base system
 "/
 #(
-	'Java.st'
-	'JavaVM.st'
+	'Java'
+	'JavaVM'
 
-	'JavaConstantPool.st'
-	'JavaSlotIndexCache.st'
+	'JavaConstantPool'
+	'JavaSlotIndexCache'
 
-	'JavaObject.st'
-	'JavaClass.st'
-	'JavaMethod.st'
-	'JavaMethodWithException.st'
-	'JavaMethodWithHandler.st'
-"/ 'JavaMethodWithBreakpoint.st'
-	'JavaContext.st'
-	'JavaProcess.st'
+	'JavaObject'
+	'JavaClass'
+	'JavaMethod'
+	'JavaMethodWithException'
+	'JavaMethodWithHandler'
+"/ 'JavaMethodWithBreakpoint'
+	'JavaContext'
+	'JavaProcess'
 
-	'JavaClassReader.st'
-	'JavaDecompiler.st'
+	'JavaClassReader'
+	'JavaDecompiler'
 
-	'JavaExceptionTableEntry.st'
-	'JavaLocalVariableTable.st'
-	'JavaLocalVariableTableEntry.st'
+	'JavaExceptionTableEntry'
+	'JavaLocalVariableTable'
+	'JavaLocalVariableTableEntry'
 
-	'JavaRef.st'
-	'JavaClassRef.st'
-	'JavaField.st'
-	'JavaFieldref.st'
-	'JavaMethodref.st'
-	'JavaInterfaceMethodref.st'
-	'JavaNameandType.st'
-	'JavaClassPointerRef.st'
-	'JavaBuiltInClassPointerRef.st'
+	'JavaRef'
+	'JavaClassRef'
+	'JavaField'
+	'JavaFieldref'
+	'JavaMethodref'
+	'JavaInterfaceMethodref'
+	'JavaNameandType'
+	'JavaClassPointerRef'
+	'JavaBuiltInClassPointerRef'
 
-	'JavaUnresolvedConstant.st'
-	'JavaUnresolvedRefConstant.st'
-	'JavaUnresolvedClassConstant.st'
-	'JavaUnresolvedFieldrefConstant.st'
-	'JavaUnresolvedMethodrefConstant.st'
-	'JavaUnresolvedInterfaceMethodrefConstant.st'
-	'JavaUnresolvedNameandTypeConstant.st'
-	'JavaUnresolvedStringConstant.st'
+	'JavaUnresolvedConstant'
+	'JavaUnresolvedRefConstant'
+	'JavaUnresolvedClassConstant'
+	'JavaUnresolvedFieldrefConstant'
+	'JavaUnresolvedMethodrefConstant'
+	'JavaUnresolvedInterfaceMethodrefConstant'
+	'JavaUnresolvedNameandTypeConstant'
+	'JavaUnresolvedStringConstant'
 
-	'JavaView.st'
-	'JavaTopView.st'
-	'JavaPopUpView.st'
-	'JavaEmbeddedFrameView.st'
+	'JavaView'
+	'JavaTopView'
+	'JavaPopUpView'
+	'JavaEmbeddedFrameView'
 
-	'JavaDeparser.st'   
-) do:[:f |
-	Smalltalk fileIn:f
+	'JavaDeparser'   
+) do:[:fBase | |f|
+	f := fBase , '.cls'.
+	(Smalltalk fileIn:f) ifTrue:[
+	    Transcript showCR:('loaded ' , f).
+	] ifFalse:[
+	    f := fBase , '.st'.
+	    Smalltalk fileIn:f
+	]
 ]
 !