Skip to content

Commit cad795b

Browse files
committed
Changes for eclipse-cs integration
Also updates Checkstyle to version 6.7.
1 parent 43d9503 commit cad795b

43 files changed

Lines changed: 395 additions & 111 deletions

Some content is hidden

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

‎AndroidAnnotations/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ target
44
*.ipr
55
*.iws
66
*.idea
7+
.checkstyle

‎AndroidAnnotations/androidannotations-api/.settings/org.eclipse.jdt.core.prefs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
33
org.eclipse.jdt.core.compiler.compliance=1.7
44
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
5+
org.eclipse.jdt.core.compiler.processAnnotations=disabled
56
org.eclipse.jdt.core.compiler.source=1.7
67
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
78
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

‎AndroidAnnotations/androidannotations-api/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
<description>The API jar containing the annotations and the runtime helpers</description>
3030
<name>AndroidAnnotations API</name>
3131

32+
<properties>
33+
<main.basedir>${project.parent.basedir}</main.basedir>
34+
</properties>
3235

3336
<dependencies>
3437
<dependency>

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import android.os.Looper;
3030
import android.util.Log;
3131

32-
public class BackgroundExecutor {
32+
public final class BackgroundExecutor {
3333

3434
private static final String TAG = "BackgroundExecutor";
3535

@@ -82,12 +82,16 @@ private BackgroundExecutor() {
8282
* the task to execute
8383
* @param delay
8484
* the time from now to delay execution, in milliseconds
85-
* @throws IllegalArgumentException
86-
* if <code>delay</code> is strictly positive and the current
87-
* executor does not support scheduling (if
88-
* {@link #setExecutor(Executor)} has been called with such an
89-
* executor)
85+
*
86+
* if <code>delay</code> is strictly positive and the current
87+
* executor does not support scheduling (if
88+
* {@link #setExecutor(Executor)} has been called with such an
89+
* executor)
9090
* @return Future associated to the running task
91+
*
92+
* @throws IllegalArgumentException
93+
* if the current executor set by {@link #setExecutor(Executor)}
94+
* does not support scheduling
9195
*/
9296
private static Future<?> directExecute(Runnable runnable, int delay) {
9397
Future<?> future = null;

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/UiThreadExecutor.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* This class provide operations for
2828
* {@link org.androidannotations.annotations.UiThread UiThread} tasks.
2929
*/
30-
public class UiThreadExecutor {
30+
public final class UiThreadExecutor {
3131

3232
private static final Handler HANDLER = new Handler(Looper.getMainLooper()) {
3333
@Override
@@ -112,7 +112,7 @@ public static void cancelAll(String id) {
112112
HANDLER.removeCallbacksAndMessages(token);
113113
}
114114

115-
private static class Token {
115+
private static final class Token {
116116
int runnablesCount = 0;
117117
final String id;
118118

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@
111111
* }
112112
* </pre>
113113
*/
114+
@SuppressWarnings("checkstyle:finalclass")
114115
public class ViewServer implements Runnable {
115116
/**
116117
* The default port used to start view servers.
@@ -518,7 +519,7 @@ public void write(int oneByte) throws IOException {
518519
}
519520
}
520521

521-
private static class NoopViewServer extends ViewServer {
522+
private static final class NoopViewServer extends ViewServer {
522523
private NoopViewServer() {
523524
}
524525

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/bundle/BundleHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
/**
2424
* Utility class for working with {@link Bundle} objects.
2525
*/
26-
public class BundleHelper {
26+
public final class BundleHelper {
2727

2828
private BundleHelper() {
2929

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/roboguice/RoboGuiceHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
* Reflection utils to call methods which are accessible in RoboGuice package
2323
* but not from outside.
2424
*/
25-
public class RoboGuiceHelper {
25+
public final class RoboGuiceHelper {
2626

2727
private RoboGuiceHelper() {
2828
}

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/sharedpreferences/SetXmlSerializer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static String serialize(Set<String> set) {
6161
.endDocument();
6262

6363
} catch (IllegalArgumentException | IOException | IllegalStateException e) {
64-
64+
// should never happen
6565
}
6666

6767
return writer.toString();

‎AndroidAnnotations/androidannotations-bundle/pom.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
<name>AndroidAnnotations Bundle</name>
3131
<packaging>pom</packaging>
3232

33+
<properties>
34+
<main.basedir>${project.parent.basedir}</main.basedir>
35+
</properties>
3336

3437
<dependencies>
3538
<dependency>

0 commit comments

Comments
 (0)