Skip to content

Commit 72450f4

Browse files
sottysotty
committed
[ROASTER-11] Reformat code
1 parent b30fd2a commit 72450f4

77 files changed

Lines changed: 1028 additions & 870 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/AccessBuilder.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,22 @@
1212
import org.jboss.forge.roaster.model.source.JavaSource;
1313

1414
public interface AccessBuilder<O extends JavaSource<O>,
15-
P extends ExpressionHolder<O>,
16-
E extends NonPrimitiveExpression<O,P,E>> {
15+
P extends ExpressionHolder<O>,
16+
E extends NonPrimitiveExpression<O,P,E>>
17+
{
1718

18-
public Field<O,E> field( String field );
19+
public Field<O,E> field(String field);
1920

20-
public Getter<O,E> getter( String field, String klass );
21+
public Getter<O,E> getter(String field, String klass);
2122

22-
public Getter<O,E> getter( String field, Class klass );
23+
public Getter<O,E> getter(String field, Class klass);
2324

24-
public Setter<O,E> setter( String fldName, String type, ExpressionSource<?,?,?> value );
25+
public Setter<O,E> setter(String fldName, String type, ExpressionSource<?,?,?> value);
2526

26-
public Setter<O,E> setter( String fldName, Class type, ExpressionSource<?,?,?> value );
27+
public Setter<O,E> setter(String fldName, Class type, ExpressionSource<?,?,?> value);
2728

28-
public MethodCallExpression<O,E> invoke( String method );
29+
public MethodCallExpression<O,E> invoke(String method);
2930

30-
public ArrayIndexer<O,E> itemAt( ExpressionSource<?,?,?> index );
31+
public ArrayIndexer<O,E> itemAt(ExpressionSource<?,?,?> index);
3132

3233
}

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/Accessor.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@
1111
import org.jboss.forge.roaster.model.source.JavaSource;
1212

1313
public interface Accessor<O extends JavaSource<O>,
14-
P extends ExpressionHolder<O>,
15-
E extends NonPrimitiveExpression<O,P,E>>
16-
extends Argument<O,P,E>,
17-
AccessBuilder<O,P,E> {
14+
P extends ExpressionHolder<O>,
15+
E extends NonPrimitiveExpression<O,P,E>>
16+
extends Argument<O,P,E>,
17+
AccessBuilder<O,P,E>
18+
{
1819

1920
}

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/Argument.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
import org.jboss.forge.roaster.model.source.JavaSource;
1313

1414
public interface Argument<O extends JavaSource<O>,
15-
P extends ExpressionHolder<O>,
16-
E extends ExpressionSource<O,P,E>>
17-
extends ExpressionSource<O,P,E> {
15+
P extends ExpressionHolder<O>,
16+
E extends ExpressionSource<O,P,E>>
17+
extends ExpressionSource<O,P,E>
18+
{
1819

1920
}

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/ArgumentHolder.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
import java.util.List;
1414

1515
public interface ArgumentHolder<O extends JavaSource<O>,
16-
P extends ExpressionHolder<O>,
17-
E extends NonPrimitiveExpression<O,P,?>>
18-
extends ExpressionHolder<O> {
16+
P extends ExpressionHolder<O>,
17+
E extends NonPrimitiveExpression<O,P,?>>
18+
extends ExpressionHolder<O>
19+
{
1920

20-
public E addArgument( Argument<?,?,?> arg );
21+
public E addArgument(Argument<?,?,?> arg);
2122

22-
public List<Argument<O,E,?>> getArguments();
23+
public List<Argument<O,E,?>> getArguments();
2324
}

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/ArrayConstructorExpression.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@
1313
import java.util.List;
1414

1515
public interface ArrayConstructorExpression<O extends JavaSource<O>,
16-
P extends ExpressionHolder<O>>
17-
extends Argument<O,P,ArrayConstructorExpression<O,P>>,
18-
NonPrimitiveExpression<O,P,ArrayConstructorExpression<O,P>> {
16+
P extends ExpressionHolder<O>>
17+
extends Argument<O,P,ArrayConstructorExpression<O,P>>,
18+
NonPrimitiveExpression<O,P,ArrayConstructorExpression<O,P>>
19+
{
1920

20-
public ArrayConstructorExpression<O,P> addDimension( ExpressionSource<?,?,?> dim );
21+
public ArrayConstructorExpression<O,P> addDimension(ExpressionSource<?,?,?> dim);
2122

22-
public ArrayConstructorExpression<O,P> init( ArrayInit<?,?> array );
23+
public ArrayConstructorExpression<O,P> init(ArrayInit<?,?> array);
2324

24-
public ArrayInit<O,ArrayConstructorExpression<O,P>> getInit();
25+
public ArrayInit<O,ArrayConstructorExpression<O,P>> getInit();
2526

26-
public List<ExpressionSource<O,ArrayConstructorExpression<O,P>,?>> getDimensions();
27+
public List<ExpressionSource<O,ArrayConstructorExpression<O,P>,?>> getDimensions();
2728

28-
public int getDimension();
29+
public int getDimension();
2930
}

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/ArrayIndexer.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@
1010
import org.jboss.forge.roaster.model.ExpressionHolder;
1111
import org.jboss.forge.roaster.model.source.JavaSource;
1212

13-
public interface ArrayIndexer<O extends JavaSource<O>,P extends ExpressionHolder<O>>
14-
extends OrdinalArgument<O,P,ArrayIndexer<O,P>>,
15-
NonPrimitiveExpression<O,P,ArrayIndexer<O,P>> {
13+
public interface ArrayIndexer<O extends JavaSource<O>, P extends ExpressionHolder<O>>
14+
extends OrdinalArgument<O,P,ArrayIndexer<O,P>>,
15+
NonPrimitiveExpression<O,P,ArrayIndexer<O,P>>
16+
{
1617

17-
public ExpressionSource<O,ArrayIndexer<O,P>,?> getIndex();
18+
public ExpressionSource<O,ArrayIndexer<O,P>,?> getIndex();
1819

19-
public ArrayIndexer<O,P> setIndex( ExpressionSource<?,?,?> index );
20+
public ArrayIndexer<O,P> setIndex(ExpressionSource<?,?,?> index);
2021

21-
public ExpressionSource<O,ArrayIndexer<O,P>,?> getTarget();
22+
public ExpressionSource<O,ArrayIndexer<O,P>,?> getTarget();
2223

23-
public ArrayIndexer<O,P> setTarget( ExpressionSource<?,?,?> target );
24+
public ArrayIndexer<O,P> setTarget(ExpressionSource<?,?,?> target);
2425
}

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/ArrayInit.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,19 @@
1313

1414
import java.util.List;
1515

16-
public interface ArrayInit<O extends JavaSource<O>,P extends ExpressionHolder<O>>
17-
extends ExpressionSource<O,P,ArrayInit<O,P>>,
18-
NonPrimitiveExpression<O,P,ArrayInit<O,P>> {
16+
public interface ArrayInit<O extends JavaSource<O>, P extends ExpressionHolder<O>>
17+
extends ExpressionSource<O,P,ArrayInit<O,P>>,
18+
NonPrimitiveExpression<O,P,ArrayInit<O,P>>
19+
{
1920

20-
public ArrayInit<O,P> addElement( ArrayInit<?,?> subRow );
21+
public ArrayInit<O,P> addElement(ArrayInit<?,?> subRow);
2122

22-
public ArrayInit<O,P> addElement( ExpressionSource<?,?,?> subElement );
23+
public ArrayInit<O,P> addElement(ExpressionSource<?,?,?> subElement);
2324

24-
public List<ExpressionSource<O,ArrayInit<O,P>,?>> getElements();
25+
public List<ExpressionSource<O,ArrayInit<O,P>,?>> getElements();
2526

26-
public int size();
27+
public int size();
2728

28-
public int getDimension();
29+
public int getDimension();
2930

3031
}

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/AssignExpression.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,20 @@
1111
import org.jboss.forge.roaster.model.source.JavaSource;
1212

1313
public interface AssignExpression<O extends JavaSource<O>,
14-
P extends ExpressionHolder<O>>
15-
extends NonPrimitiveExpression<O,P,AssignExpression<O,P>>,
16-
Argument<O,P,AssignExpression<O,P>> {
14+
P extends ExpressionHolder<O>>
15+
extends NonPrimitiveExpression<O,P,AssignExpression<O,P>>,
16+
Argument<O,P,AssignExpression<O,P>>
17+
{
1718

18-
public String getOperator();
19+
public String getOperator();
1920

20-
public AssignExpression<O,P> setOperator( Assignment op );
21+
public AssignExpression<O,P> setOperator(Assignment op);
2122

22-
public Accessor<O,AssignExpression<O,P>,?> getLeft();
23+
public Accessor<O,AssignExpression<O,P>,?> getLeft();
2324

24-
public AssignExpression<O,P> setLeft( Accessor<?,?,?> left );
25+
public AssignExpression<O,P> setLeft(Accessor<?,?,?> left);
2526

26-
public ExpressionSource<O,AssignExpression<O,P>,?> getRight();
27+
public ExpressionSource<O,AssignExpression<O,P>,?> getRight();
2728

28-
public AssignExpression<O,P> setRight( ExpressionSource<?,?,?> right );
29+
public AssignExpression<O,P> setRight(ExpressionSource<?,?,?> right);
2930
}

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/Assignment.java‎

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,46 @@
77

88
package org.jboss.forge.roaster.model.expressions;
99

10-
public enum Assignment {
11-
12-
ASSIGN( "=" ),
13-
DIVIDE_ASSIGN( "/=" ),
14-
PLUS_ASSIGN( "+=" ),
15-
MINUS_ASSIGN( "-=" ),
16-
TIMES_ASSIGN( "*=" ),
17-
REMAINDER_ASSIGN( "%=" ),
18-
19-
LEFT_SHIFT_ASSIGN( "<<=" ),
20-
RIGHT_SHIFT_ASSIGN( ">>=" ),
21-
RIGHT_SHIFT_UNSIGNED_ASSIGN( ">>>=" ),
22-
BITWISE_XOR_ASSIGN( "^=" ),
23-
BITWISE_AND_ASSIGN( "&=" ),
24-
BITWISE_OR_ASSIGN( "|=" );
25-
26-
private String op;
27-
28-
Assignment( String o ) {
29-
op = o;
30-
}
31-
32-
public String getOp() {
33-
return op;
34-
}
35-
36-
37-
public static Assignment build( String x ) {
38-
for ( Assignment en : Assignment.values() ) {
39-
if ( en.getOp().equals( x ) ) {
40-
return en;
41-
}
42-
}
43-
throw new IllegalStateException( "Unrecognized operation " + x );
44-
}
10+
public enum Assignment
11+
{
12+
13+
ASSIGN("="),
14+
DIVIDE_ASSIGN("/="),
15+
PLUS_ASSIGN("+="),
16+
MINUS_ASSIGN("-="),
17+
TIMES_ASSIGN("*="),
18+
REMAINDER_ASSIGN("%="),
19+
20+
LEFT_SHIFT_ASSIGN("<<="),
21+
RIGHT_SHIFT_ASSIGN(">>="),
22+
RIGHT_SHIFT_UNSIGNED_ASSIGN(">>>="),
23+
BITWISE_XOR_ASSIGN("^="),
24+
BITWISE_AND_ASSIGN("&="),
25+
BITWISE_OR_ASSIGN("|=");
26+
27+
private String op;
28+
29+
Assignment(String o)
30+
{
31+
op = o;
32+
}
33+
34+
public String getOp()
35+
{
36+
return op;
37+
}
38+
39+
40+
public static Assignment build(String x)
41+
{
42+
for (Assignment en : Assignment.values())
43+
{
44+
if (en.getOp().equals(x))
45+
{
46+
return en;
47+
}
48+
}
49+
throw new IllegalStateException("Unrecognized operation " + x);
50+
}
4551

4652
}

‎api/src/main/java/org/jboss/forge/roaster/model/expressions/BasicExpressionFactory.java‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,46 @@
1212
import org.jboss.forge.roaster.model.source.JavaSource;
1313

1414
public interface BasicExpressionFactory<O extends JavaSource<O>,
15-
P extends ExpressionHolder<O>>
16-
extends LiteralBuilder<O,P>,
17-
ConstructorBuilder<O,P> {
15+
P extends ExpressionHolder<O>>
16+
extends LiteralBuilder<O,P>,
17+
ConstructorBuilder<O,P>
18+
{
1819

19-
public Variable<O,P> var( String varName );
20+
public Variable<O,P> var(String varName);
2021

21-
public OperatorExpression<O,P> operator( Op op );
22+
public OperatorExpression<O,P> operator(Op op);
2223

23-
public UnaryExpression<O,P> operator( PrefixOp operator, Argument<O,?,?> arg );
24+
public UnaryExpression<O,P> operator(PrefixOp operator, Argument<O,?,?> arg);
2425

25-
public TernaryExpression<O,P> ternary();
26+
public TernaryExpression<O,P> ternary();
2627

27-
public CastExpression<O,P> cast( String klass, ExpressionSource<O,?,?> arg );
28+
public CastExpression<O,P> cast(String klass, ExpressionSource<O,?,?> arg);
2829

29-
public CastExpression<O,P> cast( Class klass, ExpressionSource<O,?,?> arg );
30+
public CastExpression<O,P> cast(Class klass, ExpressionSource<O,?,?> arg);
3031

31-
public ParenExpression<O,P> paren( ExpressionSource<O,?,?> inner );
32+
public ParenExpression<O,P> paren(ExpressionSource<O,?,?> inner);
3233

33-
public UnaryExpression<O,P> not( Argument<O,?,?> arg );
34+
public UnaryExpression<O,P> not(Argument<O,?,?> arg);
3435

35-
public AssignExpression<O,P> assign( Assignment operator );
36+
public AssignExpression<O,P> assign(Assignment operator);
3637

37-
public DeclareExpression<O,P> declare( String klass, String name );
38+
public DeclareExpression<O,P> declare(String klass, String name);
3839

39-
public DeclareExpression<O,P> declare( Class klass, String name );
40+
public DeclareExpression<O,P> declare(Class klass, String name);
4041

41-
public DeclareExpression<O,P> declare( String klass, String name, ExpressionSource<O,?,?> init );
42+
public DeclareExpression<O,P> declare(String klass, String name, ExpressionSource<O,?,?> init);
4243

43-
public DeclareExpression<O,P> declare( Class klass, String name, ExpressionSource<O,?,?> init );
44+
public DeclareExpression<O,P> declare(Class klass, String name, ExpressionSource<O,?,?> init);
4445

45-
public Accessor<O,P,?> classStatic( String klass );
46+
public Accessor<O,P,?> classStatic(String klass);
4647

47-
public Accessor<O,P,?> classStatic( Class klass );
48+
public Accessor<O,P,?> classStatic(Class klass);
4849

49-
public InstanceofExpression<O,P> instanceOf( String klass, ExpressionSource<O,?,?> arg );
50+
public InstanceofExpression<O,P> instanceOf(String klass, ExpressionSource<O,?,?> arg);
5051

51-
public InstanceofExpression<O,P> instanceOf( Class klass, ExpressionSource<O,?,?> arg );
52+
public InstanceofExpression<O,P> instanceOf(Class klass, ExpressionSource<O,?,?> arg);
5253

53-
public Super<O,P> sup();
54+
public Super<O,P> sup();
5455

55-
public ArrayInit<O,ArrayConstructorExpression<O,P>> vec();
56+
public ArrayInit<O,ArrayConstructorExpression<O,P>> vec();
5657
}

0 commit comments

Comments
 (0)