diff --git a/topics/java/lci/xbgf/correct-doc1.xbgf b/topics/java/lci/xbgf/correct-doc1.xbgf
index 0db55655..53a0dd5e 100644
--- a/topics/java/lci/xbgf/correct-doc1.xbgf
+++ b/topics/java/lci/xbgf/correct-doc1.xbgf
@@ -28,19 +28,21 @@
ConstantModifier
-
- ConstantModifiers
-
-
-
- ConstantModifiers
-
-
- ConstantModifier
-
-
-
-
+
+
+ ConstantModifiers
+
+
+
+ ConstantModifiers
+
+
+ ConstantModifier
+
+
+
+
+
-
- TypeName
-
-
-
- TypeName
-
-
- .
-
-
- Identifier
-
-
-
-
+
+
+ TypeName
+
+
+
+ TypeName
+
+
+ .
+
+
+ Identifier
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/edit-doc1.xbgf b/topics/java/lci/xbgf/edit-doc1.xbgf
index 68a7cb5c..8b176697 100644
--- a/topics/java/lci/xbgf/edit-doc1.xbgf
+++ b/topics/java/lci/xbgf/edit-doc1.xbgf
@@ -90,76 +90,80 @@
-
- ClassInstanceCreationExpression
-
-
-
- new
-
-
- ClassOrInterfaceType
-
-
- (
-
-
-
-
- ArgumentList
-
-
-
-
- )
-
-
- ClassBody
-
-
-
-
+
+
+ ClassInstanceCreationExpression
+
+
+
+ new
+
+
+ ClassOrInterfaceType
+
+
+ (
+
+
+
+
+ ArgumentList
+
+
+
+
+ )
+
+
+ ClassBody
+
+
+
+
+
-
- ClassInstanceCreationExpression
-
-
-
- Primary
-
-
- .
-
-
- new
-
-
- Identifier
-
-
- (
-
-
-
-
- ArgumentList
-
-
-
-
- )
-
-
-
-
- ClassBody
-
-
-
-
-
-
+
+
+ ClassInstanceCreationExpression
+
+
+
+ Primary
+
+
+ .
+
+
+ new
+
+
+ Identifier
+
+
+ (
+
+
+
+
+ ArgumentList
+
+
+
+
+ )
+
+
+
+
+ ClassBody
+
+
+
+
+
+
+
ClassInstanceCreationExpression
diff --git a/topics/java/lci/xbgf/edit-doc3.xbgf b/topics/java/lci/xbgf/edit-doc3.xbgf
index db89972f..b66f1c0a 100644
--- a/topics/java/lci/xbgf/edit-doc3.xbgf
+++ b/topics/java/lci/xbgf/edit-doc3.xbgf
@@ -8,33 +8,35 @@
vs.
-->
-
- Primary
-
-
-
- NonWildcardTypeArguments
-
-
-
-
- ExplicitGenericInvocationSuffix
-
-
-
-
- this
-
-
- Arguments
-
-
-
-
-
-
-
-
+
+
+ Primary
+
+
+
+ NonWildcardTypeArguments
+
+
+
+
+ ExplicitGenericInvocationSuffix
+
+
+
+
+ this
+
+
+ Arguments
+
+
+
+
+
+
+
+
+
diff --git a/topics/java/lci/xbgf/editDeclarations.xbgf b/topics/java/lci/xbgf/editDeclarations.xbgf
index 6df5e90e..bc5fe971 100644
--- a/topics/java/lci/xbgf/editDeclarations.xbgf
+++ b/topics/java/lci/xbgf/editDeclarations.xbgf
@@ -766,12 +766,14 @@
-
- InterfaceBodyDeclaration
-
- ;
-
-
+
+
+ InterfaceBodyDeclaration
+
+ ;
+
+
+
-
- ClassBodyDeclaration
-
- ;
-
-
+
+
+ ClassBodyDeclaration
+
+ ;
+
+
+
-
- ClassBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- ClassOrInterfaceDeclaration
-
-
-
-
+
+
+ ClassBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ ClassOrInterfaceDeclaration
+
+
+
+
+
-
- Primary
-
- ArrayCreationExpression
-
-
+
+
+ Primary
+
+ ArrayCreationExpression
+
+
+
ArrayCreationExpression
DimExprs
@@ -253,21 +255,23 @@
-
- Primary
-
-
-
- new
-
-
- Creator
-
-
-
-
+
+
+ Primary
+
+
+
+ new
+
+
+ Creator
+
+
+
+
+
-
+
-
- Primary
-
- ArrayAccess
-
-
+
+
+ Primary
+
+ ArrayAccess
+
+
+
-
- Primary
-
- MethodInvocation
-
-
+
+
+ Primary
+
+ MethodInvocation
+
+
+
-
- Primary
-
- ClassInstanceCreationExpression
-
-
+
+
+ Primary
+
+ ClassInstanceCreationExpression
+
+
+
-
- Primary
-
-
-
- Primary
-
-
- SuperSuffix
-
-
-
-
+
+
+ Primary
+
+
+
+ Primary
+
+
+ SuperSuffix
+
+
+
+
+
-
- Primary
-
-
-
- QualifiedIdentifier
-
-
- .
-
-
- super
-
-
- SuperSuffix
-
-
-
-
+
+
+ Primary
+
+
+
+ QualifiedIdentifier
+
+
+ .
+
+
+ super
+
+
+ SuperSuffix
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/editExpressions-doc3.xbgf b/topics/java/lci/xbgf/editExpressions-doc3.xbgf
index 784d05bb..b1c09eea 100644
--- a/topics/java/lci/xbgf/editExpressions-doc3.xbgf
+++ b/topics/java/lci/xbgf/editExpressions-doc3.xbgf
@@ -152,7 +152,7 @@
Primary
-
+
-
- Primary
-
- ArrayCreationExpression
-
-
+
+
+ Primary
+
+ ArrayCreationExpression
+
+
+
ArrayCreationExpression
DimExprs
@@ -337,19 +339,21 @@
-
- Primary
-
-
-
- new
-
-
- Creator
-
-
-
-
+
+
+ Primary
+
+
+
+ new
+
+
+ Creator
+
+
+
+
+
-
- Primary
-
- ArrayAccess
-
-
+
+
+ Primary
+
+ ArrayAccess
+
+
+
ArrayAccess
-
- Primary
-
- MethodInvocation
-
-
+
+
+ Primary
+
+ MethodInvocation
+
+
+
MethodInvocation
-
- Primary
-
- ClassInstanceCreationExpression
-
-
+
+
+ Primary
+
+ ClassInstanceCreationExpression
+
+
+
ClassInstanceCreationExpression
-
- Primary
-
-
-
- Primary
-
-
- SuperSuffix
-
-
-
-
+
+
+ Primary
+
+
+
+ Primary
+
+
+ SuperSuffix
+
+
+
+
+
-
- Primary
-
-
-
- QualifiedIdentifier
-
-
- .
-
-
- super
-
-
- SuperSuffix
-
-
-
-
+
+
+ Primary
+
+
+
+ QualifiedIdentifier
+
+
+ .
+
+
+ super
+
+
+ SuperSuffix
+
+
+
+
+
@@ -1022,9 +1048,9 @@
-
- ExplicitGenericInvocation
-
+
+ ExplicitGenericInvocation
+
class
@@ -1121,26 +1147,28 @@
- [], ,([n(StatementExpression), n(MoreStatementExpressions)])
-->
-
- ForInit
-
-
-
-
-
- final
-
-
-
-
- Type
-
-
- VariableDeclarators
-
-
-
-
+
+
+ ForInit
+
+
+
+
+
+ final
+
+
+
+
+ Type
+
+
+ VariableDeclarators
+
+
+
+
+
@@ -1237,36 +1265,38 @@
-
- ForVarControlRest
-
-
-
- VariableDeclaratorsRest
-
-
- ;
-
-
-
-
- Expression
-
-
-
-
- ;
-
-
-
-
- ForUpdate
-
-
-
-
-
-
+
+
+ ForVarControlRest
+
+
+
+ VariableDeclaratorsRest
+
+
+ ;
+
+
+
+
+ Expression
+
+
+
+
+ ;
+
+
+
+
+ ForUpdate
+
+
+
+
+
+
+
@@ -1329,7 +1359,7 @@
-
+
-
- Primary
-
- ArrayAccess
-
-
+
+
+ Primary
+
+ ArrayAccess
+
+
+
ArrayAccess
@@ -254,111 +256,119 @@
-
- Primary
-
-
-
- new
-
-
- QualifiedIdentifier
-
-
-
-
- IdentifierSuffix
-
-
-
-
-
-
+
+
+ Primary
+
+
+
+ new
+
+
+ QualifiedIdentifier
+
+
+
+
+ IdentifierSuffix
+
+
+
+
+
+
+
-
- Primary
-
-
-
- new
-
-
- BasicType
-
-
-
-
-
-
- [
-
-
- Expression
-
-
- ]
-
-
-
-
-
-
- BracketsOpt
-
-
-
-
+
+
+ Primary
+
+
+
+ new
+
+
+ BasicType
+
+
+
+
+
+
+ [
+
+
+ Expression
+
+
+ ]
+
+
+
+
+
+
+ BracketsOpt
+
+
+
+
+
-
- Primary
-
-
-
- new
-
-
- QualifiedIdentifier
-
-
-
-
-
-
- [
-
-
- Expression
-
-
- ]
-
-
-
-
-
-
- BracketsOpt
-
-
-
-
+
+
+ Primary
+
+
+
+ new
+
+
+ QualifiedIdentifier
+
+
+
+
+
+
+ [
+
+
+ Expression
+
+
+ ]
+
+
+
+
+
+
+ BracketsOpt
+
+
+
+
+
-
- Primary
-
-
-
- new
-
-
- Creator
-
-
-
-
+
+
+ Primary
+
+
+
+ new
+
+
+ Creator
+
+
+
+
+
@@ -448,43 +458,47 @@
new stuff
,([n(BasicType), n(BracketsOpt), t(.), t(class)]), ,([t(void), t(.), t(class)])-->
-
- Primary
-
-
-
- BasicType
-
-
- BracketsOpt
-
-
- .
-
-
- class
-
-
-
-
+
+
+ Primary
+
+
+
+ BasicType
+
+
+ BracketsOpt
+
+
+ .
+
+
+ class
+
+
+
+
+
-
- Primary
-
-
-
- void
-
-
- .
-
-
- class
-
-
-
-
+
+
+ Primary
+
+
+
+ void
+
+
+ .
+
+
+ class
+
+
+
+
+
-
- Primary
-
-
-
- Primary
-
-
- .
-
-
- Identifier
-
-
-
-
- IdentifierSuffix
-
-
-
-
-
-
+
+
+ Primary
+
+
+
+ Primary
+
+
+ .
+
+
+ Identifier
+
+
+
+
+ IdentifierSuffix
+
+
+
+
+
+
+
-
- Primary
-
-
-
- Primary
-
-
- .
-
-
- Identifier
-
-
-
-
+
+
+ Primary
+
+
+
+ Primary
+
+
+ .
+
+
+ Identifier
+
+
+
+
+
diff --git a/topics/java/lci/xbgf/extend-doc1.xbgf b/topics/java/lci/xbgf/extend-doc1.xbgf
index 665ab04a..00e19c46 100644
--- a/topics/java/lci/xbgf/extend-doc1.xbgf
+++ b/topics/java/lci/xbgf/extend-doc1.xbgf
@@ -52,28 +52,30 @@
-
- FieldAccess
-
-
-
- ClassName
-
-
- .
-
-
- super
-
-
- .
-
-
- Identifier
-
-
-
-
+
+
+ FieldAccess
+
+
+
+ ClassName
+
+
+ .
+
+
+ super
+
+
+ .
+
+
+ Identifier
+
+
+
+
+
-
- MethodModifier
-
- strictfp
-
-
+
+
+ MethodModifier
+
+ strictfp
+
+
+
-
- ClassMemberDeclaration
-
- ClassDeclaration
-
-
+
+
+ ClassMemberDeclaration
+
+ ClassDeclaration
+
+
+
-
- ClassMemberDeclaration
-
- InterfaceDeclaration
-
-
+
+
+ ClassMemberDeclaration
+
+ InterfaceDeclaration
+
+
+
-
- ClassMemberDeclaration
-
- ;
-
-
+
+
+ ClassMemberDeclaration
+
+ ;
+
+
+
-
- InterfaceMemberDeclaration
-
- ClassDeclaration
-
-
+
+
+ InterfaceMemberDeclaration
+
+ ClassDeclaration
+
+
+
-
- InterfaceMemberDeclaration
-
- InterfaceDeclaration
-
-
+
+
+ InterfaceMemberDeclaration
+
+ InterfaceDeclaration
+
+
+
-
- InterfaceMemberDeclaration
-
- ;
-
-
+
+
+ InterfaceMemberDeclaration
+
+ ;
+
+
+
-
- BlockStatement
-
- ClassDeclaration
-
-
+
+
+ BlockStatement
+
+ ClassDeclaration
+
+
+
-
- ClassModifier
-
- protected
-
-
+
+
+ ClassModifier
+
+ protected
+
+
+
-
- ClassModifier
-
- private
-
-
+
+
+ ClassModifier
+
+ private
+
+
+
-
- ClassModifier
-
- static
-
-
+
+
+ ClassModifier
+
+ static
+
+
+
-
- ClassModifier
-
- strictfp
-
-
+
+
+ ClassModifier
+
+ strictfp
+
+
+
-
- ExplicitConstructorInvocation
-
-
-
- Primary
-
-
- .
-
-
- super
-
-
- (
-
-
-
-
- ArgumentList
-
-
-
-
- )
-
-
- ;
-
-
-
-
+
+
+ ExplicitConstructorInvocation
+
+
+
+ Primary
+
+
+ .
+
+
+ super
+
+
+ (
+
+
+
+
+ ArgumentList
+
+
+
+
+ )
+
+
+ ;
+
+
+
+
+
-
- MethodInvocation
-
-
-
- ClassName
-
-
- .
-
-
- super
-
-
- .
-
-
- Identifier
-
-
- (
-
-
-
-
- ArgumentList
-
-
-
-
- )
-
-
-
-
+
+
+ MethodInvocation
+
+
+
+ ClassName
+
+
+ .
+
+
+ super
+
+
+ .
+
+
+ Identifier
+
+
+ (
+
+
+
+
+ ArgumentList
+
+
+
+
+ )
+
+
+
+
+
-
- InterfaceModifier
-
- protected
-
-
+
+
+ InterfaceModifier
+
+ protected
+
+
+
-
- InterfaceModifier
-
- private
-
-
+
+
+ InterfaceModifier
+
+ private
+
+
+
-
- InterfaceModifier
-
- static
-
-
+
+
+ InterfaceModifier
+
+ static
+
+
+
-
- InterfaceModifier
-
- strictfp
-
-
+
+
+ InterfaceModifier
+
+ strictfp
+
+
+
-
- ArrayCreationExpression
-
-
-
- new
-
-
- PrimitiveType
-
-
- Dims
-
-
- ArrayInitializer
-
-
-
-
+
+
+ ArrayCreationExpression
+
+
+
+ new
+
+
+ PrimitiveType
+
+
+ Dims
+
+
+ ArrayInitializer
+
+
+
+
+
-
- ArrayCreationExpression
-
-
-
- new
-
-
- TypeName
-
-
- Dims
-
-
- ArrayInitializer
-
-
-
-
+
+
+ ArrayCreationExpression
+
+
+
+ new
+
+
+ TypeName
+
+
+ Dims
+
+
+ ArrayInitializer
+
+
+
+
+
@@ -1091,38 +1107,40 @@
-
- MethodInvocation
-
-
-
- TypeName
-
-
- .
-
-
- NonWildTypeArguments
-
-
- Identifier
-
-
- (
-
-
-
-
- ArgumentList
-
-
-
-
- )
-
-
-
-
+
+
+ MethodInvocation
+
+
+
+ TypeName
+
+
+ .
+
+
+ NonWildTypeArguments
+
+
+ Identifier
+
+
+ (
+
+
+
+
+ ArgumentList
+
+
+
+
+ )
+
+
+
+
+
-
- Modifier
-
- strictfp
-
-
+
+
+ Modifier
+
+ strictfp
+
+
+
-
- SuperSuffix
-
- Arguments
-
-
+
+
+ SuperSuffix
+
+ Arguments
+
+
+
-
- IdentifierSuffix
-
-
-
- [
-
-
-
-
-
-
- ]
-
-
- BracketsOpt
-
-
- .
-
-
- class
-
-
-
-
-
-
- Expression
-
-
- ]
-
-
-
-
-
-
-
-
+
+
+ IdentifierSuffix
+
+
+
+ [
+
+
+
+
+
+
+ ]
+
+
+ BracketsOpt
+
+
+ .
+
+
+ class
+
+
+
+
+
+
+ Expression
+
+
+ ]
+
+
+
+
+
+
+
+
+
-
- IdentifierSuffix
-
-
-
- .
-
-
-
-
- class
-
-
- this
-
-
-
-
- super
-
-
- Arguments
-
-
-
-
-
-
- new
-
-
- InnerCreator
-
-
-
-
-
-
-
-
+
+
+ IdentifierSuffix
+
+
+
+ .
+
+
+
+
+ class
+
+
+ this
+
+
+
+
+ super
+
+
+ Arguments
+
+
+
+
+
+
+ new
+
+
+ InnerCreator
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/extendDeclarations.xbgf b/topics/java/lci/xbgf/extendDeclarations.xbgf
index abef341b..9a80d842 100644
--- a/topics/java/lci/xbgf/extendDeclarations.xbgf
+++ b/topics/java/lci/xbgf/extendDeclarations.xbgf
@@ -61,12 +61,14 @@
-
- ElementValue
-
- ElementValueArrayInitializer
-
-
+
+
+ ElementValue
+
+ ElementValueArrayInitializer
+
+
+
@@ -141,20 +143,24 @@
-
- ElementValue
-
- Annotation
-
-
+
+
+ ElementValue
+
+ Annotation
+
+
+
-
- Modifier
-
- Annotation
-
-
+
+
+ Modifier
+
+ Annotation
+
+
+
@@ -318,12 +324,14 @@
-
- ClassDeclaration
-
- EnumDeclaration
-
-
+
+
+ ClassDeclaration
+
+ EnumDeclaration
+
+
+
@@ -334,22 +342,24 @@
-
- SwitchLabel
-
-
-
- case
-
-
- EnumConstantName
-
-
- :
-
-
-
-
+
+
+ SwitchLabel
+
+
+
+ case
+
+
+ EnumConstantName
+
+
+ :
+
+
+
+
+
-
- InterfaceBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- TypeParameters
-
-
- Type
-
-
- Identifier
-
-
- (
-
-
-
-
- FormalParameterDecls
-
-
-
-
- )
-
-
- BracketsOpt
-
-
-
-
-
-
- throws
-
-
- QualifiedIdentifierList
-
-
-
-
-
-
- ;
-
-
-
-
+
+
+ InterfaceBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ TypeParameters
+
+
+ Type
+
+
+ Identifier
+
+
+ (
+
+
+
+
+ FormalParameterDecls
+
+
+
+
+ )
+
+
+ BracketsOpt
+
+
+
+
+
+
+ throws
+
+
+ QualifiedIdentifierList
+
+
+
+
+
+
+ ;
+
+
+
+
+
-
- InterfaceBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- TypeParameters
-
-
- void
-
-
- Identifier
-
-
- (
-
-
-
-
- FormalParameterDecls
-
-
-
-
- )
-
-
- BracketsOpt
-
-
-
-
-
-
- throws
-
-
- QualifiedIdentifierList
-
-
-
-
-
-
- ;
-
-
-
-
+
+
+ InterfaceBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ TypeParameters
+
+
+ void
+
+
+ Identifier
+
+
+ (
+
+
+
+
+ FormalParameterDecls
+
+
+
+
+ )
+
+
+ BracketsOpt
+
+
+
+
+
+
+ throws
+
+
+ QualifiedIdentifierList
+
+
+
+
+
+
+ ;
+
+
+
+
+
-
- ForInit
-
-
-
-
-
- final
-
-
-
-
- Type
-
-
- VariableDeclarators
-
-
-
-
+
+
+ ForInit
+
+
+
+
+
+ final
+
+
+
+
+ Type
+
+
+ VariableDeclarators
+
+
+
+
+
-
- Expression3
-
-
-
-
-
-
-
- QualifiedIdentifier
-
-
-
-
- Primary
-
-
-
-
-
-
- PostfixOp
-
-
-
-
-
-
- -->
-
-
-
- Primary
-
-
-
- QualifiedIdentifier
-
-
- Primary
-
-
-
-
- Expression3
-
-
+
+
+ Expression3
+
+
+
+
+
+
+
+ QualifiedIdentifier
+
+
+
+
+ Primary
+
+
+
+
+
+
+ PostfixOp
+
+
+
+
+
+
+
+
-
- FieldModifier
-
- Annotation
-
-
+
+
+ FieldModifier
+
+ Annotation
+
+
+
-
- InterfaceModifier
-
- Annotation
-
-
+
+
+ InterfaceModifier
+
+ Annotation
+
+
+
-
- AbstractMethodModifier
-
- Annotation
-
-
+
+
+ AbstractMethodModifier
+
+ Annotation
+
+
+
-
- ConstantModifier
-
- Annotation
-
-
+
+
+ ConstantModifier
+
+ Annotation
+
+
+
-
- MethodModifier
-
- Annotation
-
-
+
+
+ MethodModifier
+
+ Annotation
+
+
+
-
- ClassModifier
-
- Annotation
-
-
+
+
+ ClassModifier
+
+ Annotation
+
+
+
-
- ConstructorModifier
-
- Annotation
-
-
+
+
+ ConstructorModifier
+
+ Annotation
+
+
+
-
- Statement
-
-
-
- assert
-
-
- Expression
-
-
-
-
-
-
- :
-
-
- Expression
-
-
-
-
-
-
- ;
-
-
-
-
+
+
+ Statement
+
+
+
+ assert
+
+
+ Expression
+
+
+
+
+
+
+ :
+
+
+ Expression
+
+
+
+
+
+
+ ;
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/generalizeBlock.xbgf b/topics/java/lci/xbgf/generalizeBlock.xbgf
index bf7f5f9d..a5c0d7d2 100644
--- a/topics/java/lci/xbgf/generalizeBlock.xbgf
+++ b/topics/java/lci/xbgf/generalizeBlock.xbgf
@@ -9,12 +9,14 @@
- [], n(Block)
-->
-
- MethodBody
-
- ;
-
-
+
+
+ MethodBody
+
+ ;
+
+
+
diff --git a/topics/java/lci/xbgf/inlineStatements.xbgf b/topics/java/lci/xbgf/inlineStatements.xbgf
index 3b3c79f3..245da3f3 100644
--- a/topics/java/lci/xbgf/inlineStatements.xbgf
+++ b/topics/java/lci/xbgf/inlineStatements.xbgf
@@ -1,7 +1,7 @@
-
+
-
- Statement
-
-
-
- if
-
-
- (
-
-
- Expression
-
-
- )
-
-
- StatementNoShortIf
-
-
- else
-
-
- Statement
-
-
-
-
+
+
+ Statement
+
+
+
+ if
+
+
+ (
+
+
+ Expression
+
+
+ )
+
+
+ StatementNoShortIf
+
+
+ else
+
+
+ Statement
+
+
+
+
+
-
-
+
IfThenStatement
@@ -126,7 +127,7 @@
-
+
IfThenStatement
StatementNoShortIf
@@ -232,7 +233,7 @@
-
+
-
- BlockStatement
-
- ClassDeclaration
-
-
+
+
+ BlockStatement
+
+ ClassDeclaration
+
+
+
-
- BlockStatement
-
- ClassOrInterfaceDeclaration
-
-
+
+
+ BlockStatement
+
+ ClassOrInterfaceDeclaration
+
+
+
@@ -287,7 +292,7 @@
-
+
LocalVariableDeclaration
-
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorClasses-doc2.xbgf b/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
index 70e98ddd..02b3d55a 100644
--- a/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorClasses-doc2.xbgf
@@ -264,23 +264,23 @@
-
-
-
-
-
-
-
-
- static
-
-
-
-
- Block
-
-
-
+
+
+
+
+
+
+
+
+ static
+
+
+
+
+ Block
+
+
+
@@ -394,7 +394,9 @@
ClassBodyDeclaration
- ClassBodyDeclaration
+
+ ClassBodyDeclaration
+
MethodOrFieldDecl
@@ -425,12 +427,14 @@
-
- MethodOrFieldRest
-
- VariableDeclaratorRest
-
-
+
+
+ MethodOrFieldRest
+
+ VariableDeclaratorRest
+
+
+
@@ -463,13 +467,15 @@
-
- ClassBodyDeclaration
-
- FieldDeclaration
-
-
+
+
+ ClassBodyDeclaration
+
+ FieldDeclaration
+
+
+
FieldDeclaration
-
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorClasses-doc3.xbgf b/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
index f63e30bc..8a0bb4cc 100644
--- a/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorClasses-doc3.xbgf
@@ -310,7 +310,7 @@
-
+
-
- ClassBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- Type
-
-
- VariableDeclarators
-
-
- ;
-
-
-
-
+
+
+ ClassBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ Type
+
+
+ VariableDeclarators
+
+
+ ;
+
+
+
+
+
@@ -771,25 +775,27 @@
-
- ClassBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- void
-
-
- Identifier
-
-
- VoidMethodDeclaratorRest
-
-
-
-
+
+
+ ClassBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ void
+
+
+ Identifier
+
+
+ VoidMethodDeclaratorRest
+
+
+
+
+
@@ -829,19 +835,21 @@
-
- ClassBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- MethodOrFieldDecl
-
-
-
-
+
+
+ ClassBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ MethodOrFieldDecl
+
+
+
+
+
@@ -872,30 +880,34 @@
-
- MethodOrFieldRest
-
- MethodDeclaratorRest
-
-
+
+
+ MethodOrFieldRest
+
+ MethodDeclaratorRest
+
+
+
-
- ClassBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- Identifier
-
-
- ConstructorDeclaratorRest
-
-
-
-
+
+
+ ClassBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ Identifier
+
+
+ ConstructorDeclaratorRest
+
+
+
+
+
TypeParameterList
TypeParameterList
-
+
ModifiersOpt
diff --git a/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf b/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
index fbf335be..0c543f91 100644
--- a/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorDeclarations-doc3.xbgf
@@ -771,47 +771,49 @@
- [], ,([n(FormalParameters), n(BracketsOpt), ?(,([t(throws), n(QualifiedIdentifierList)])), n(MethodBody)])
-->
-
- MethodDeclaratorRest
-
-
-
- FormalParameters
-
-
- BracketsOpt
-
-
-
-
-
-
- throws
-
-
- QualifiedIdentifierList
-
-
-
-
-
-
-
-
- MethodBody
-
-
-
-
- ;
-
-
-
-
-
-
-
-
+
+
+ MethodDeclaratorRest
+
+
+
+ FormalParameters
+
+
+ BracketsOpt
+
+
+
+
+
+
+ throws
+
+
+ QualifiedIdentifierList
+
+
+
+
+
+
+
+
+
+
+ ;
+
+
+
+
+ MethodBody
+
+
+
+
+
+
+
FormalParameters
@@ -839,12 +841,14 @@ AnnotationTypeElementRest:
AnnotationTypeDeclaration
-->
-
- AnnotationTypeElementDeclaration
-
- ;
-
-
+
+
+ AnnotationTypeElementDeclaration
+
+ ;
+
+
+
@@ -1288,4 +1292,4 @@ AnnotationTypeElementRest:
AnnotationTypeElementRest
-
\ No newline at end of file
+
diff --git a/topics/java/lci/xbgf/refactorExpressions.xbgf b/topics/java/lci/xbgf/refactorExpressions.xbgf
index 7997dde8..f25404f2 100644
--- a/topics/java/lci/xbgf/refactorExpressions.xbgf
+++ b/topics/java/lci/xbgf/refactorExpressions.xbgf
@@ -112,7 +112,7 @@
"(" PrimitiveType [ Dims ] ")" UnaryExpression
"(" ReferenceType ")" UnaryExpressionNotPlusMinus
-->
-
+
Assignment
-
- AssignmentExpression
-
- Assignment
-
-
+
+
+ AssignmentExpression
+
+ Assignment
+
+
+
ConditionalExpression
diff --git a/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf b/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf
index 05103d01..e1224388 100644
--- a/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorInterfaces-doc2.xbgf
@@ -185,22 +185,24 @@
-
- InterfaceBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- Type
-
-
- VariableDeclarators
-
-
-
-
+
+
+ InterfaceBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ Type
+
+
+ VariableDeclarators
+
+
+
+
+
-
- ElementValuePairs
-
-
-
- ElementValuePairs
-
-
- ,
-
-
- ElementValuePair
-
-
-
-
+
+
+ ElementValuePairs
+
+
+
+ ElementValuePairs
+
+
+ ,
+
+
+ ElementValuePair
+
+
+
+
+
ElementValuePairs
@@ -407,25 +409,27 @@
Annotation
-
- Annotation
-
-
-
- @
-
-
- QualifiedIdentifier
-
-
- (
-
-
- )
-
-
-
-
+
+
+ Annotation
+
+
+
+ @
+
+
+ QualifiedIdentifier
+
+
+ (
+
+
+ )
+
+
+
+
+
Annotation
@@ -965,62 +969,66 @@
-
- InterfaceBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- Type
-
-
- VariableDeclarators
-
-
- ;
-
-
-
-
+
+
+ InterfaceBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ Type
+
+
+ VariableDeclarators
+
+
+ ;
+
+
+
+
+
-
- InterfaceBodyDeclaration
-
-
-
- ModifiersOpt
-
-
- Type
-
-
- Identifier
-
-
- ConstantDeclaratorRest
-
-
-
-
-
-
- ,
-
-
- ConstantDeclarator
-
-
-
-
-
-
- ;
-
-
-
-
+
+
+ InterfaceBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ Type
+
+
+ Identifier
+
+
+ ConstantDeclaratorRest
+
+
+
+
+
+
+ ,
+
+
+ ConstantDeclarator
+
+
+
+
+
+
+ ;
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/refactorStatements-doc3.xbgf b/topics/java/lci/xbgf/refactorStatements-doc3.xbgf
index 53d625ba..68cbf56b 100644
--- a/topics/java/lci/xbgf/refactorStatements-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorStatements-doc3.xbgf
@@ -452,12 +452,14 @@
VariableModifiers
VariableModifiers
-
- VariableModifier
-
- Annotation
-
-
+
+
+ VariableModifier
+
+ Annotation
+
+
+
VariableModifier
diff --git a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
index f6983812..13050842 100644
--- a/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
+++ b/topics/java/lci/xbgf/refactorStatements-jls1.xbgf
@@ -331,12 +331,14 @@
- [], ;([n(LocalVariableDeclarationStatement), n(ClassOrInterfaceDeclaration), ,([?(,([n(Identifier), t(:)])), n(Statement)])])
-->
-
- BlockStatement
-
- ClassOrInterfaceDeclaration
-
-
+
+
+ BlockStatement
+
+ ClassOrInterfaceDeclaration
+
+
+
diff --git a/topics/java/lci/xbgf/refactorTypes-doc2.xbgf b/topics/java/lci/xbgf/refactorTypes-doc2.xbgf
index 967124fa..10d73c49 100644
--- a/topics/java/lci/xbgf/refactorTypes-doc2.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-doc2.xbgf
@@ -210,12 +210,14 @@
ArrayType
-
- ReferenceType
-
- ArrayType
-
-
+
+
+ ReferenceType
+
+ ArrayType
+
+
+
diff --git a/topics/java/lci/xbgf/refactorTypes-doc3.xbgf b/topics/java/lci/xbgf/refactorTypes-doc3.xbgf
index 621f3e56..1caffe1a 100644
--- a/topics/java/lci/xbgf/refactorTypes-doc3.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-doc3.xbgf
@@ -146,7 +146,7 @@
-
+
ClassOrInterfaceType
@@ -157,32 +157,60 @@
- BracketsOpt
+
+
+ Dims
+
+
-
-
- ArrayType
-
+
+
+
+
- ReferenceType
+ BracketsOpt
- ArrayType
+
+
+ Dims
+
+
+
+
+
+ ArrayType
+
+
+
+ ReferenceType
+
+ ArrayType
+
+
+
TypeVariable
-
- ReferenceType
-
- Identifier
-
-
+
+
+ ReferenceType
+
+ Identifier
+
+
+
@@ -202,33 +230,48 @@
-->
TypeDeclSpecifier
-
-
-
-
-
- TypeDeclSpecifier
-
-
-
-
- TypeArguments
-
-
-
-
- BracketsOpt
-
-
-
-
- Type
-
-
+
+
RelationalExpression
-
-
+
+
+
+ RelationalExpression
+
+
+ instanceof
+
+
+
+
+ Type
+
+
+
+
+
+
+
+ Type
+
+
+
+ TypeDeclSpecifier
+
+
+
+
+ TypeArguments
+
+
+
+
+ BracketsOpt
+
+
+
+
+
-
-
- BracketsOpt
-
-
-
- Dims
-
-
-
-
-
-
+
BracketsOpt
diff --git a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
index a43bff47..2947c30f 100644
--- a/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
+++ b/topics/java/lci/xbgf/refactorTypes-jls1.xbgf
@@ -96,12 +96,14 @@
ArrayType
-
- ReferenceType
-
- ArrayType
-
-
+
+
+ ReferenceType
+
+ ArrayType
+
+
+