Skip to content

Commit 8c3566e

Browse files
WonderCsaboWonderCsabo
committed
Unify annotation location on coding style
1 parent 1bf60d8 commit 8c3566e

10 files changed

Lines changed: 24 additions & 11 deletions

File tree

‎AndroidAnnotations/androidannotations-core/androidannotations-test/src/main/java/org/androidannotations/test/ebean/AbstractBean.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
@EBean
2525
public abstract class AbstractBean {
2626

27-
@RootContext Context context;
27+
@RootContext
28+
Context context;
2829

2930
public AbstractBean(String param) {
3031

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/CorePlugin.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ public String getName() {
109109
return NAME;
110110
}
111111

112-
@Override public List<Option> getSupportedOptions() {
112+
@Override
113+
public List<Option> getSupportedOptions() {
113114
return Arrays.asList(OPTION_TRACE, OPTION_THREAD_CONTROL);
114115
}
115116

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDelegate.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,8 @@ public final JDefinedClass definedClass(String fullyQualifiedClassName) {
7373
return holder.definedClass(fullyQualifiedClassName);
7474
}
7575

76-
@Override public AndroidAnnotationsEnvironment environment() {
76+
@Override
77+
public AndroidAnnotationsEnvironment environment() {
7778
return holder.environment();
7879
}
7980
}

‎AndroidAnnotations/androidannotations-ormlite/ormlite/src/main/java/org/androidannotations/ormlite/OrmLitePlugin.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public String getName() {
2929
return NAME;
3030
}
3131

32-
@Override public void addHandlers(AnnotationHandlers annotationHandlers, AndroidAnnotationsEnvironment androidAnnotationEnv) {
32+
@Override
33+
public void addHandlers(AnnotationHandlers annotationHandlers, AndroidAnnotationsEnvironment androidAnnotationEnv) {
3334
annotationHandlers.add(new OrmLiteDaoHandler(androidAnnotationEnv));
3435
}
3536
}

‎AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/EBeanUsingService.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
@EBean
2323
public class EBeanUsingService {
2424

25-
@RestService MyService myService;
25+
@RestService
26+
MyService myService;
2627

2728
@Background
2829
void callSomeService(Event event, int id) {

‎AndroidAnnotations/androidannotations-rest-spring/rest-spring-test/src/main/java/org/androidannotations/rest/spring/test/MyServiceActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
@EActivity
2424
public class MyServiceActivity extends Activity {
2525

26-
@RestService MyService myService;
26+
@RestService
27+
MyService myService;
2728

2829
}

‎AndroidAnnotations/androidannotations-roboguice/roboguice-test/src/test/java/org/androidannotations/roboguice/test/InjectedActivityTest.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,10 @@ public class InjectedActivityTest {
4141

4242
ActivityWithRoboGuice_ injectedActivity;
4343

44-
@Inject Counter fieldCounter;
45-
@Inject FakeDateProvider fakeDateProvider;
44+
@Inject
45+
Counter fieldCounter;
46+
@Inject
47+
FakeDateProvider fakeDateProvider;
4648

4749
@Before
4850
public void setUp() {

‎AndroidAnnotations/androidannotations-roboguice/roboguice/src/main/java/org/androidannotations/roboguice/RoboGuicePlugin.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ public String getName() {
2929
return NAME;
3030
}
3131

32-
@Override public void addHandlers(AnnotationHandlers annotationHandlers, AndroidAnnotationsEnvironment androidAnnotationEnv) {
32+
@Override
33+
public void addHandlers(AnnotationHandlers annotationHandlers, AndroidAnnotationsEnvironment androidAnnotationEnv) {
3334
annotationHandlers.add(new RoboGuiceHandler(androidAnnotationEnv));
3435
}
3536
}

‎AndroidAnnotations/checkstyle-checks-ci.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
<module name="IllegalInstantiation" />
3131
<module name="OneTopLevelClass" />
3232
<module name="AnnotationUseStyle" />
33-
<module name="AnnotationLocation" />
33+
<module name="AnnotationLocation" >
34+
<property name="allowSamelineSingleParameterlessAnnotation" value="false" />
35+
</module>
3436
<module name="ClassTypeParameterName" />
3537
<module name="ConstantName" />
3638
<module name="LocalVariableName" />

‎AndroidAnnotations/checkstyle-checks.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
<module name="IllegalInstantiation" />
3131
<module name="OneTopLevelClass" />
3232
<module name="AnnotationUseStyle" />
33-
<module name="AnnotationLocation" />
33+
<module name="AnnotationLocation" >
34+
<property name="allowSamelineSingleParameterlessAnnotation" value="false" />
35+
</module>
3436
<module name="ClassTypeParameterName" />
3537
<module name="ConstantName" />
3638
<module name="LocalVariableName" />

0 commit comments

Comments
 (0)