--- a/tools/stx_libjava_tools.st	Mon Apr 22 23:54:52 2013 +0100
+++ b/tools/stx_libjava_tools.st	Tue Apr 23 00:47:30 2013 +0100
@@ -34,14 +34,13 @@
      exclude individual packages in the #excludedFromPreRequisites method."
 
     ^ #(
-        #'stx:goodies/petitparser'    "PPAbstractParseTest - superclass of JavaParserIITests "
-        #'stx:goodies/sunit'    "TestCase - superclass of JavaParserIITests "
-        #'stx:libbasic'    "LibraryDefinition - superclass of stx_libjava_tools "
-        #'stx:libcomp'    "ParseNode - superclass of JavaInterfaceDeclarationNode "
-        #'stx:libjava'    "PPJavaNode - superclass of JavaMethodDeclarationNode "
-        #'stx:libtool'    "DictionaryInspectorView - superclass of JavaMapInspectorView "
-        #'stx:libview'    "DisplaySurface - superclass of JavaListInspectorView "
-        #'stx:libview2'    "Model - superclass of JavaSettingsApplication "
+        #'stx:goodies/petitparser'    "PPCompositeParser - superclass of JavaParserII "
+        #'stx:libbasic'    "Autoload - superclass of JavaParserITests "
+        #'stx:libcomp'    "ParseNode - superclass of JavaConstructorDeclarationNode "
+        #'stx:libjava'    "JavaObject - extended "
+        #'stx:libtool'    "InspectorView - superclass of JavaListInspectorView "
+        #'stx:libview'    "SimpleView - superclass of JavaListInspectorView "
+        #'stx:libview2'    "SimpleDialog - superclass of JavaCodeLibraryEditor "
         #'stx:libwidg2'    "HierarchicalItem - superclass of JavaCodeBundleEditor::Item "
     )
 !
@@ -168,20 +167,21 @@
         JavaSetInspectorView
         JavaSettingsApplication
         JavaSourcePartition
+        (JavaSourcePartitioner autoload)
         (JavaSourcePartitionerTests autoload)
         JavaSourceReference
         (#'JavaSyntaxHighlighter_Eclipse' autoload)
+        (#'JavaSyntaxHighlighter_Old' autoload)
         #'stx_libjava_tools'
         JavaDeclarationWithJavadodNode
         JavaImportDeclarationNode
+        JavaLiteralNode
         JavaPackageDeclarationNode
         JavaParserII
         JavaScanner
         JavaSourceFile
-        (#'JavaSyntaxHighlighter_Old' autoload)
         JavaMethodLikeDeclarationNode
         JavaParser
-        (JavaSourcePartitioner autoload)
         JavaTypeDeclarationNode
         JavaAnnotationDeclarationNode
         JavaClassDeclarationNode