--- a/tools/Make.spec	Wed Apr 03 22:09:09 2013 +0100
+++ b/tools/Make.spec	Thu Apr 04 00:53:00 2013 +0100
@@ -50,75 +50,69 @@
 STCWARNINGS=-warnNonStandard
 
 COMMON_CLASSES= \
+	JavaCodeBundleEditor \
+	JavaCodeLibraryEditor \
 	JavaListInspectorView \
 	JavaMapInspectorView \
 	JavaParseNode \
 	JavaParseNodeBuilder \
+	JavaParserI \
 	JavaParser_Eclipse \
+	JavaScannerBase \
 	JavaSetInspectorView \
+	JavaSettingsApplication \
+	JavaSourcePartition \
+	JavaSourceReference \
 	stx_libjava_tools \
-	JavaCommentNode \
-	JavaFormalParameterNode \
-	JavaMethodDeclaratorNode \
-	JavaMethodNode \
-	JavaParserI \
-	JavaTypeNode \
-	JavaArrayTypeNode \
-	JavaBooleanTypeNode \
-	JavaCharTypeNode \
-	JavaClassOrInterfaceTypeNode \
-	JavaDocNode \
-	JavaDoubleTypeNode \
-	JavaFloatTypeNode \
-	JavaIntTypeNode \
-	JavaLongTypeNode \
+	JavaDeclarationWithJavadodNode \
+	JavaImportDeclarationNode \
+	JavaPackageDeclarationNode \
 	JavaParserII \
-	JavaVoidTypeNode \
+	JavaScanner \
+	JavaSourceFile \
+	JavaMethodLikeDeclarationNode \
 	JavaParser \
-	JavaScannerBase \
-	JavaScanner \
+	JavaTypeDeclarationNode \
+	JavaAnnotationDeclarationNode \
+	JavaClassDeclarationNode \
+	JavaConstructorDeclarationNode \
+	JavaEnumDeclarationNode \
+	JavaInterfaceDeclarationNode \
 	JavaSyntaxHighlighter \
-	JavaSettingsApplication \
-	JavaSourceReference \
-	JavaCodeBundleEditor \
-	JavaCodeLibraryEditor \
 
 
 
 
 COMMON_OBJS= \
+    $(OUTDIR_SLASH)JavaCodeBundleEditor.$(O) \
+    $(OUTDIR_SLASH)JavaCodeLibraryEditor.$(O) \
     $(OUTDIR_SLASH)JavaListInspectorView.$(O) \
     $(OUTDIR_SLASH)JavaMapInspectorView.$(O) \
     $(OUTDIR_SLASH)JavaParseNode.$(O) \
     $(OUTDIR_SLASH)JavaParseNodeBuilder.$(O) \
+    $(OUTDIR_SLASH)JavaParserI.$(O) \
     $(OUTDIR_SLASH)JavaParser_Eclipse.$(O) \
+    $(OUTDIR_SLASH)JavaScannerBase.$(O) \
     $(OUTDIR_SLASH)JavaSetInspectorView.$(O) \
+    $(OUTDIR_SLASH)JavaSettingsApplication.$(O) \
+    $(OUTDIR_SLASH)JavaSourcePartition.$(O) \
+    $(OUTDIR_SLASH)JavaSourceReference.$(O) \
     $(OUTDIR_SLASH)stx_libjava_tools.$(O) \
-    $(OUTDIR_SLASH)JavaCommentNode.$(O) \
-    $(OUTDIR_SLASH)JavaFormalParameterNode.$(O) \
-    $(OUTDIR_SLASH)JavaMethodDeclaratorNode.$(O) \
-    $(OUTDIR_SLASH)JavaMethodNode.$(O) \
-    $(OUTDIR_SLASH)JavaParserI.$(O) \
-    $(OUTDIR_SLASH)JavaTypeNode.$(O) \
-    $(OUTDIR_SLASH)JavaArrayTypeNode.$(O) \
-    $(OUTDIR_SLASH)JavaBooleanTypeNode.$(O) \
-    $(OUTDIR_SLASH)JavaCharTypeNode.$(O) \
-    $(OUTDIR_SLASH)JavaClassOrInterfaceTypeNode.$(O) \
-    $(OUTDIR_SLASH)JavaDocNode.$(O) \
-    $(OUTDIR_SLASH)JavaDoubleTypeNode.$(O) \
-    $(OUTDIR_SLASH)JavaFloatTypeNode.$(O) \
-    $(OUTDIR_SLASH)JavaIntTypeNode.$(O) \
-    $(OUTDIR_SLASH)JavaLongTypeNode.$(O) \
+    $(OUTDIR_SLASH)JavaDeclarationWithJavadodNode.$(O) \
+    $(OUTDIR_SLASH)JavaImportDeclarationNode.$(O) \
+    $(OUTDIR_SLASH)JavaPackageDeclarationNode.$(O) \
     $(OUTDIR_SLASH)JavaParserII.$(O) \
-    $(OUTDIR_SLASH)JavaVoidTypeNode.$(O) \
+    $(OUTDIR_SLASH)JavaScanner.$(O) \
+    $(OUTDIR_SLASH)JavaSourceFile.$(O) \
+    $(OUTDIR_SLASH)JavaMethodLikeDeclarationNode.$(O) \
     $(OUTDIR_SLASH)JavaParser.$(O) \
-    $(OUTDIR_SLASH)JavaScannerBase.$(O) \
-    $(OUTDIR_SLASH)JavaScanner.$(O) \
+    $(OUTDIR_SLASH)JavaTypeDeclarationNode.$(O) \
+    $(OUTDIR_SLASH)JavaAnnotationDeclarationNode.$(O) \
+    $(OUTDIR_SLASH)JavaClassDeclarationNode.$(O) \
+    $(OUTDIR_SLASH)JavaConstructorDeclarationNode.$(O) \
+    $(OUTDIR_SLASH)JavaEnumDeclarationNode.$(O) \
+    $(OUTDIR_SLASH)JavaInterfaceDeclarationNode.$(O) \
     $(OUTDIR_SLASH)JavaSyntaxHighlighter.$(O) \
-    $(OUTDIR_SLASH)JavaSettingsApplication.$(O) \
-    $(OUTDIR_SLASH)JavaSourceReference.$(O) \
-    $(OUTDIR_SLASH)JavaCodeBundleEditor.$(O) \
-    $(OUTDIR_SLASH)JavaCodeLibraryEditor.$(O) \
     $(OUTDIR_SLASH)extensions.$(O) \