diff --git a/topics/java/lci/xbgf/addFeatures1to2.xbgf b/topics/java/lci/xbgf/addFeatures1to2.xbgf
index e89cc8de..fd93d3bd 100644
--- a/topics/java/lci/xbgf/addFeatures1to2.xbgf
+++ b/topics/java/lci/xbgf/addFeatures1to2.xbgf
@@ -17,4 +17,127 @@
Modifier
+
+
+
+ SuperSuffix
+
+ Arguments
+
+
+
+ SuperSuffix
+
+
+
+
+ MethodBody
+
+
+
+
+ MethodBody
+
+
+ ;
+
+
+
+
+ MethodDeclaratorRest
+
+
+
+
+
+
+ IdentifierSuffix
+
+
+
+ [
+
+
+
+
+
+
+ ]
+
+
+ BracketsOpt
+
+
+ .
+
+
+ class
+
+
+
+
+
+
+ Expression
+
+
+ ]
+
+
+
+
+
+
+
+
+
+
+
+ IdentifierSuffix
+
+
+
+ .
+
+
+
+
+ class
+
+
+ this
+
+
+
+
+ super
+
+
+ Arguments
+
+
+
+
+
+
+ new
+
+
+ InnerCreator
+
+
+
+
+
+
+
+
+
+ IdentifierSuffix
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/deyaccifyExpressions.xbgf b/topics/java/lci/xbgf/deyaccifyExpressions.xbgf
index b08384d0..32229c7e 100644
--- a/topics/java/lci/xbgf/deyaccifyExpressions.xbgf
+++ b/topics/java/lci/xbgf/deyaccifyExpressions.xbgf
@@ -121,10 +121,8 @@ vs
p([], 'CastExpression', ','([t('('), ;([n('Expression'), n('Type')]), t(')'), n('UnaryExpression')])),
-->
-
- CastExpression
-
-
+ CastExpression
+
CastExpression
@@ -151,59 +149,7 @@ vs
-
-
-
- CastExpression
-
-
-
- (
-
-
- BasicType
-
-
-
-
- Dims
-
-
-
-
- )
-
-
- UnaryExpression
-
-
-
-
-
-
-
- CastExpression
-
-
-
- (
-
-
- QualifiedIdentifier
-
-
- BracketsOpt
-
-
- )
-
-
- UnaryExpressionNotPlusMinus
-
-
-
-
-
+
CastExpression
diff --git a/topics/java/lci/xbgf/refactorStatements.xbgf b/topics/java/lci/xbgf/refactorStatements.xbgf
index 216fd3d0..90f0a022 100644
--- a/topics/java/lci/xbgf/refactorStatements.xbgf
+++ b/topics/java/lci/xbgf/refactorStatements.xbgf
@@ -26,7 +26,7 @@
-
+
+ StatementNoShortIf
+ ForStatementNoShortIf
+ WhileStatementNoShortIf
+ LabeledStatementNoShortIf
+ IfThenElseStatementNoShortIf
+
Catches
-
+
VariableDeclarators
-
+
+
+
+
+
+ throws
+
+
+ TypeList
+
+
+
+
+
+
+ throws
+
+
+ QualifiedIdentifierList
+
+
+
+
+
+
+ QualifiedIdentifierList
+
+
+
+ QualifiedIdentifier
+
+
+
+
+
+
+ ,
+
+
+ QualifiedIdentifier
+
+
+
+
+
+
+
+
+
+
+
+ ClassMemberDeclaration
+ StaticInitializer
+ ConstructorDeclaration
+ MethodDeclaration
+
+ ClassBodyDeclaration
+
+
+ ClassBodyDeclaration
+
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+ static
+
+
+ Block
+
+
+
+
+
+
+
+ static
+
+
+
+
+ static
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+
+
+
+
+
+
+ MethodDeclaratorRest
+
+
+
+ FormalParameters
+
+
+
+
+
+
+ [
+
+
+ ]
+
+
+
+
+
+
+
+
+
+
+ throws
+
+
+ QualifiedIdentifierList
+
+
+
+
+
+
+ MethodBody
+
+
+
+
+
+
+ BracketsOpt
+
+ MethodDeclaratorRest
+
+
+
+
+ ConstructorDeclarator
+
+
+ ConstructorDeclaratorRest
+
+
+
+ FormalParameters
+
+
+
+
+
+
+ throws
+
+
+ QualifiedIdentifierList
+
+
+
+
+
+
+ ConstructorBody
+
+
+
+
+
+
+
+
+
+ ConstructorBody
+
+
+ MethodBody
+
+
+ ConstructorDeclaratorRest
+
+
+ ConstructorBody
+ ExplicitConstructorInvocation
+
+
+
+
+ ClassBodyDeclaration
+
+ ;
+
+
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ ClassOrInterfaceDeclaration
+
+
+
+
+
+
+
+
+ VariableDeclarators
+
+ ClassBodyDeclaration
+
+
+
+ VariableDeclarator
+
+ ClassBodyDeclaration
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ Type
+
+
+ Identifier
+
+
+ VariableDeclaratorRest
+
+
+
+
+
+
+ ,
+
+
+ Identifier
+
+
+ VariableDeclaratorRest
+
+
+
+
+
+
+ ;
+
+
+
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+ ModifiersOpt
+
+
+ Type
+
+
+ Identifier
+
+
+ VariableDeclaratorRest
+
+
+
+
+
+
+
+
+
+
+ ClassBodyDeclaration
+
+
+
+
+
+
+ ModifiersOpt
+
+
+ Type
+
+
+ Identifier
+
+
+ MethodDeclaratorRest
+
+
+
+
+
+
+ ModifiersOpt
+
+
+ Type
+
+
+ Identifier
+
+
+ VariableDeclaratorRest
+
+
+
+
+
+
+
+
+ ModifiersOpt
+
+
+ Type
+
+
+ Identifier
+
+
+
+
+ MethodDeclaratorRest
+
+
+ VariableDeclaratorRest
+
+
+
+
+
+
+
+
+ MethodOrFieldRest
+
+
+
+ MethodDeclaratorRest
+
+
+ VariableDeclaratorRest
+
+
+
+
+
+
+
+ MethodOrFieldDecl
+
+
+
+ Type
+
+
+ Identifier
+
+
+ MethodOrFieldRest
+
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/upgradeExpressions.xbgf b/topics/java/lci/xbgf/upgradeExpressions.xbgf
new file mode 100644
index 00000000..2a758ff8
--- /dev/null
+++ b/topics/java/lci/xbgf/upgradeExpressions.xbgf
@@ -0,0 +1,573 @@
+
+
+ ArrayCreationExpression
+ PrimaryNoNewArray
+ Dims
+ Dims
+ DimExprs
+ DimExprs
+ DimExpr
+
+ BracketsOpt
+
+ Primary
+
+
+
+ ParExpression
+
+ Primary
+
+
+ ClassInstanceCreationExpression
+ FieldAccess
+ MethodInvocation
+
+ Primary
+
+ Primary
+
+
+ ArgumentList
+ ArgumentList
+
+ Arguments
+
+
+
+
+
+
+
+
+
+
+ super
+
+
+ .
+
+
+ Identifier
+
+
+ Arguments
+
+
+
+
+
+
+ super
+
+
+ .
+
+
+ Identifier
+
+
+
+
+
+
+
+
+ super
+
+
+ .
+
+
+ Identifier
+
+
+
+
+ Arguments
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Arguments
+
+
+
+
+
+
+
+
+
+ Arguments
+
+
+
+
+
+
+ SuperSuffix
+
+
+
+ .
+
+
+ Identifier
+
+
+
+
+ Arguments
+
+
+
+
+
+
+
+ Primary
+
+
+
+
+ Primary
+
+
+
+
+
+
+ Primary
+
+ this
+
+
+
+
+
+
+ Primary
+
+
+
+ this
+
+
+
+
+ Arguments
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Primary
+
+ ArrayAccess
+
+
+
+ ArrayAccess
+
+
+
+
+
+ Primary
+
+
+
+ QualifiedIdentifier
+
+
+ Arguments
+
+
+
+
+
+
+
+ IdentifierSuffix
+
+ Arguments
+
+
+
+
+
+
+
+
+ IdentifierSuffix
+
+
+
+
+ IdentifierSuffix
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Primary
+
+
+
+ new
+
+
+ QualifiedIdentifier
+
+
+ Arguments
+
+
+
+
+
+
+
+ Primary
+
+
+
+ new
+
+
+ BasicType
+
+
+
+
+
+
+ [
+
+
+ Expression
+
+
+ ]
+
+
+
+
+
+
+
+
+
+
+ [
+
+
+ ]
+
+
+ BracketsOpt
+
+
+
+
+
+
+
+
+
+
+
+ Primary
+
+
+
+ new
+
+
+ QualifiedIdentifier
+
+
+
+
+
+
+ [
+
+
+ Expression
+
+
+ ]
+
+
+
+
+
+
+
+
+
+
+ [
+
+
+ ]
+
+
+ BracketsOpt
+
+
+
+
+
+
+
+
+
+
+
+ Primary
+
+
+
+ new
+
+
+ Creator
+
+
+
+
+
+
+
+ Creator
+
+
+
+ QualifiedIdentifier
+
+
+
+
+ ArrayCreatorRest
+
+
+ ClassCreatorRest
+
+
+
+
+
+
+
+
+
+ ArrayCreatorRest
+
+
+
+ [
+
+
+
+
+
+
+ ]
+
+
+ BracketsOpt
+
+
+ ArrayInitializer
+
+
+
+
+
+
+ Expression
+
+
+ ]
+
+
+
+
+
+
+ [
+
+
+ Expression
+
+
+ ]
+
+
+
+
+
+
+ BracketsOpt
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Primary
+
+
+
+ BasicType
+
+
+ BracketsOpt
+
+
+ .
+
+
+ class
+
+
+
+
+
+
+
+ Primary
+
+
+
+ void
+
+
+ .
+
+
+ class
+
+
+
+
+
+
+
+
+
+ Primary
+
+
+
+ Primary
+
+
+ .
+
+
+ Identifier
+
+
+ Arguments
+
+
+
+
+
+
+
+ Primary
+
+
+
+ Primary
+
+
+ .
+
+
+ Identifier
+
+
+
+
+
+
+
+ Primary
+
\ No newline at end of file