diff -r 65da3a4195b6 -r 4c6ed0a28d18 parsers/java/abbrev.stc
--- a/parsers/java/abbrev.stc	Wed Jul 24 21:13:30 2019 +0000
+++ b/parsers/java/abbrev.stc	Wed Jun 10 21:33:27 2020 +0100
@@ -1,55 +1,52 @@
-# automagically generated by the project definition
-# this file is needed for stc to be able to compile modules independently.
-# it provides information about a classes filename, category and especially namespace.
 PJASTNode PJASTNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJASTNodeVisitor PJASTNodeVisitor stx:goodies/petitparser/parsers/java 'PetitJava-AST-Visitors' 0
-PPJavaLexicon PPJavaLexicon stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
-PPJavaLexiconTest PPJavaLexiconTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 1
-PPJavaToken PPJavaToken stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
-PPJavaTokenParser PPJavaTokenParser stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
-PPJavaWhitespaceParser PPJavaWhitespaceParser stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
-stx_goodies_petitparser_parsers_java stx_goodies_petitparser_parsers_java stx:goodies/petitparser/parsers/java '* Projects & Packages *' 3
-PJBlockNode PJBlockNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJBodyDeclarationNode PJBodyDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJCompilationUnitNode PJCompilationUnitNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJExpressionNode PJExpressionNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJImportDeclarationNode PJImportDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJModifierNode PJModifierNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJPackageDeclarationNode PJPackageDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJParameterDeclaratorNode PJParameterDeclaratorNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJStatementNode PJStatementNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJSyntaxNode PJSyntaxNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJTypeNode PJTypeNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJVariableDeclaratorNode PJVariableDeclaratorNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PPJavaSyntax PPJavaSyntax stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
 PJAbstractTypeDeclarationNode PJAbstractTypeDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJAnnotationNode PJAnnotationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJArrayTypeNode PJArrayTypeNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJBehaviouralNode PJBehaviouralNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJBlockNode PJBlockNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJBodyDeclarationNode PJBodyDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJBooleanLiteralNode PJBooleanLiteralNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJCharacterLiteralNode PJCharacterLiteralNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJCommentsNode PJCommentsNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJCompilationUnitNode PJCompilationUnitNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJConstructorDeclarationNode PJConstructorDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJEndOfLineCommentsNode PJEndOfLineCommentsNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJExpressionNode PJExpressionNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJExpressionStatementNode PJExpressionStatementNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJFloatLiteralNode PJFloatLiteralNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJIdentifierNode PJIdentifierNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJIfStatementNode PJIfStatementNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJImportDeclarationNode PJImportDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJInfixOperationNode PJInfixOperationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJIntegerLiteralNode PJIntegerLiteralNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJLocalVariableDeclarationStatementNode PJLocalVariableDeclarationStatementNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJMethodDeclarationNode PJMethodDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 1
+PJModifierNode PJModifierNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJNameNode PJNameNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJNullLiteralNode PJNullLiteralNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJPackageDeclarationNode PJPackageDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJParameterDeclaratorNode PJParameterDeclaratorNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJPrimitiveTypeNode PJPrimitiveTypeNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJQualifiedNameNode PJQualifiedNameNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJReturnStatementNode PJReturnStatementNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJSeparatorNode PJSeparatorNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJSimpleNameNode PJSimpleNameNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJStatementNode PJStatementNode stx:goodies/petitparser/parsers/java 'PetitJava-AST'
 PJStringLiteralNode PJStringLiteralNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJWhileStatementNode PJWhileStatementNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PPJavaParser PPJavaParser stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
-PJConstructorDeclarationNode PJConstructorDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJEndOfLineCommentsNode PJEndOfLineCommentsNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJMethodDeclarationNode PJMethodDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 1
-PJQualifiedNameNode PJQualifiedNameNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PJSimpleNameNode PJSimpleNameNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJSyntaxNode PJSyntaxNode stx:goodies/petitparser/parsers/java 'PetitJava-AST'
 PJTraditionalCommentsNode PJTraditionalCommentsNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
 PJTypeDeclarationNode PJTypeDeclarationNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
-PPJavaParserTest PPJavaParserTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 1
-PPJavaSyntaxTest PPJavaSyntaxTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 1
+PJTypeNode PJTypeNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJVariableDeclaratorNode PJVariableDeclaratorNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PJWhileStatementNode PJWhileStatementNode stx:goodies/petitparser/parsers/java 'PetitJava-AST' 0
+PPJavaLexicon PPJavaLexicon stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
+PPJavaLexiconTest PPJavaLexiconTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 0
+PPJavaParser PPJavaParser stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
+PPJavaParserTest PPJavaParserTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 0
+PPJavaSyntax PPJavaSyntax stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
+PPJavaSyntaxTest PPJavaSyntaxTest stx:goodies/petitparser/parsers/java 'PetitJava-Tests' 0
+PPJavaToken PPJavaToken stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
+PPJavaTokenParser PPJavaTokenParser stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
+PPJavaWhitespaceParser PPJavaWhitespaceParser stx:goodies/petitparser/parsers/java 'PetitJava-Core' 0
+stx_goodies_petitparser_parsers_java stx_goodies_petitparser_parsers_java stx:goodies/petitparser/parsers/java '* Projects & Packages *' 0