diff --git a/topics/java/lci/Makefile b/topics/java/lci/Makefile
index 69fcf1cb..a32e14de 100644
--- a/topics/java/lci/Makefile
+++ b/topics/java/lci/Makefile
@@ -3,7 +3,7 @@ validator = ../../../shared/tools/checkxml
build:
diff: test
- gdt bgf/jls1.prepare1.structure1.bgf bgf/jls2.prepare2.bgf
+ gdt bgf/jls1.prepare1.refactorStatements.structure1.bgf bgf/jls2.prepare2.bgf
test:
python ../../convergence/lci/lci.py java.lcf architecture
diff --git a/topics/java/lci/java.lcf b/topics/java/lci/java.lcf
index f89d7d09..92c0d841 100644
--- a/topics/java/lci/java.lcf
+++ b/topics/java/lci/java.lcf
@@ -87,6 +87,7 @@
jls1
prepare1
+ refactorStatements
structure1
diff --git a/topics/java/lci/xbgf/prepare1.xbgf b/topics/java/lci/xbgf/prepare1.xbgf
index 22849f5a..b68aba91 100644
--- a/topics/java/lci/xbgf/prepare1.xbgf
+++ b/topics/java/lci/xbgf/prepare1.xbgf
@@ -1,6 +1,9 @@
+
+ CompilationUnit
+
Type
diff --git a/topics/java/lci/xbgf/prepare2.xbgf b/topics/java/lci/xbgf/prepare2.xbgf
index a9823c6b..58a6e861 100644
--- a/topics/java/lci/xbgf/prepare2.xbgf
+++ b/topics/java/lci/xbgf/prepare2.xbgf
@@ -1,6 +1,9 @@
+
+ CompilationUnit
+
Type
@@ -29,4 +32,31 @@
InterfaceMemberDecl
+
+
+
+ ForInitOpt
+
+
+
+ ForInit
+
+
+
+
+
+ ForInitOpt
+
+
+ ForUpdateOpt
+
+
+
+ ForUpdate
+
+
+
+
+
+ ForUpdateOpt
diff --git a/topics/java/lci/xbgf/prepare3.xbgf b/topics/java/lci/xbgf/prepare3.xbgf
index 9776a7ab..284e952f 100644
--- a/topics/java/lci/xbgf/prepare3.xbgf
+++ b/topics/java/lci/xbgf/prepare3.xbgf
@@ -1,6 +1,10 @@
+
+ CompilationUnit
+
+
Type
diff --git a/topics/java/lci/xbgf/refactorStatements.xbgf b/topics/java/lci/xbgf/refactorStatements.xbgf
new file mode 100644
index 00000000..08709c73
--- /dev/null
+++ b/topics/java/lci/xbgf/refactorStatements.xbgf
@@ -0,0 +1,164 @@
+
+
+
+
+ WhileStatement
+
+
+
+ while
+
+
+ ParExpression
+
+
+ Statement
+
+
+
+
+
+
+ IfThenElseStatement
+
+
+ IfThenElseStatement
+
+
+
+ if
+
+
+ ParExpression
+
+
+ Statement
+
+
+
+
+
+
+ else
+
+
+ Statement
+
+
+
+
+
+
+
+
+
+ IfThenStatement
+ IfThenElseStatement
+
+ ForStatement
+ WhileStatement
+ LabeledStatement
+
+ StatementWithoutTrailingSubstatement
+
+
+ StatementWithoutTrailingSubstatement
+ Statement
+
+
+ TryStatement
+
+
+ TryStatement
+ Statement
+
+ Finally
+
+
+ DoStatement
+
+
+
+ do
+
+
+ Statement
+
+
+ while
+
+
+ ParExpression
+
+
+ ;
+
+
+
+
+
+
+
+ ContinueStatement
+
+
+
+ continue
+
+
+
+
+ Identifier
+
+
+
+
+
+
+
+
+
+ BreakStatement
+
+
+
+ break
+
+
+
+
+ Identifier
+
+
+
+
+
+
+
+ ThrowStatement
+ SynchronizedStatement
+ ReturnStatement
+ ContinueStatement
+ BreakStatement
+ DoStatement
+ SwitchStatement
+ EmptyStatement
+ SwitchBlock
+
+
+
+ StatementExpression
+
+
+ StatementExpression
+
+ Expression
+
+
+
+
+
\ No newline at end of file
diff --git a/topics/java/lci/xbgf/structure1.xbgf b/topics/java/lci/xbgf/structure1.xbgf
index 345ae912..b44ea702 100644
--- a/topics/java/lci/xbgf/structure1.xbgf
+++ b/topics/java/lci/xbgf/structure1.xbgf
@@ -1,25 +1,6 @@
- ForStatement
- WhileStatement
- IfThenStatement
- LabeledStatement
- IfThenElseStatement
- StatementWithoutTrailingSubstatement
-
-
- StatementExpression
-
-
- StatementExpression
-
- Expression
-
-
-
@@ -56,5 +37,57 @@
Super
Interfaces
+ ExtendsInterfaces
+
+
+ ExtendsInterfaces
+
+
+
+ extends
+
+
+ TypeList
+
+
+
+
+
+ ExtendsInterfaces
+
+
+ InterfaceDeclaration
+
+
+
+ interface
+
+
+ Identifier
+
+
+
+
+
+
+ extends
+
+
+ TypeList
+
+
+
+
+
+
+ InterfaceBody
+
+
+
+
+
+
+
PackageDeclaration
+
\ No newline at end of file