Skip to content

Commit d4dbebe

Browse files
DaySDayS
committed
Merge branch 'develop' into 572_EnhancedService
Conflicts: AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
2 parents 84130ab + 04995ad commit d4dbebe

97 files changed

Lines changed: 2632 additions & 288 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.

‎AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ Export-Package: org.androidannotations.annotations,
88
org.androidannotations.annotations.rest,
99
org.androidannotations.annotations.sharedpreferences,
1010
org.androidannotations.api.rest,
11+
org.androidannotations.api.sharedpreferences,
1112
org.androidannotations.api.view
1213
Bundle-Vendor: androidannotations
1314
Bundle-Activator: org.androidannotations.api.Activator

‎AndroidAnnotations/androidannotations-api/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@
2424
<version>1.6_r2</version>
2525
<scope>provided</scope>
2626
</dependency>
27+
<dependency>
28+
<!-- spring-android-rest-template is required to use the Rest API -->
29+
<groupId>org.springframework.android</groupId>
30+
<artifactId>spring-android-rest-template</artifactId>
31+
<version>1.0.0.RELEASE</version>
32+
<scope>provided</scope>
33+
</dependency>
2734
</dependencies>
2835

2936
<build>

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/Background.java‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,26 @@
2828
@Retention(RetentionPolicy.CLASS)
2929
@Target(ElementType.METHOD)
3030
public @interface Background {
31-
long delay() default 0;
31+
/**
32+
* Identifier for task cancellation.
33+
*
34+
* To cancel all tasks having a specified background id:
35+
*
36+
* <pre>
37+
* boolean mayInterruptIfRunning = true;
38+
* BackgroundExecutor.cancelAll(&quot;my_background_id&quot;, mayInterruptIfRunning);
39+
* </pre>
40+
**/
41+
String id() default "";
42+
43+
/** Minimum delay, in milliseconds, before the background task is executed. */
44+
int delay() default 0;
45+
46+
/**
47+
* Serial execution group.
48+
*
49+
* All background tasks having the same <code>serial</code> will be executed
50+
* sequentially.
51+
**/
52+
String serial() default "";
3253
}

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/NoTitle.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,15 @@
2222

2323
/**
2424
* Should be used on Activity classes that must have no title.
25-
*
25+
* <p/>
2626
* The activity must be annotated with {@link EActivity}.
27+
* <p/>
28+
* Note: This annotation has been deprecated. Please use
29+
* {@code WindowFeature(Window.FEATURE_NO_TITLE})} instead
2730
*
31+
* @see WindowFeature
2832
*/
33+
@Deprecated
2934
@Retention(RetentionPolicy.CLASS)
3035
@Target(ElementType.TYPE)
3136
public @interface NoTitle {

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/UiThread.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,18 @@
3131
@Target(ElementType.METHOD)
3232
public @interface UiThread {
3333
long delay() default 0;
34+
35+
/**
36+
* If propagation = REUSE, the method will check first if it is inside the
37+
* UI thread already. If so, it will directly call the method instead of
38+
* using the handler. The default value is ENQUEUE, which will always call
39+
* the handler.
40+
*
41+
* @return
42+
*/
43+
Propagation propagation() default Propagation.ENQUEUE;
44+
45+
public enum Propagation {
46+
ENQUEUE, REUSE
47+
}
3448
}

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/WindowFeature.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
/**
2+
* Copyright (C) 2010-2013 eBusiness Information, Excilys Group
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed To in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package org.androidannotations.annotations;
17+
18+
import java.lang.annotation.ElementType;
19+
import java.lang.annotation.Retention;
20+
import java.lang.annotation.RetentionPolicy;
21+
import java.lang.annotation.Target;
22+
23+
/**
24+
* Should be used on Activity classes that must have no title.
25+
*
26+
* The activity must be annotated with {@link EActivity}.
27+
*
28+
*/
29+
@Retention(RetentionPolicy.CLASS)
30+
@Target(ElementType.TYPE)
31+
public @interface WindowFeature {
32+
33+
int[] value();
34+
35+
}

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresAuthentication.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/**
2+
* Copyright (C) 2010-2013 eBusiness Information, Excilys Group
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed To in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package org.androidannotations.annotations.rest;
17+
18+
import java.lang.annotation.ElementType;
19+
import java.lang.annotation.Retention;
20+
import java.lang.annotation.RetentionPolicy;
21+
import java.lang.annotation.Target;
22+
23+
@Retention(RetentionPolicy.CLASS)
24+
@Target({ ElementType.METHOD, ElementType.TYPE })
25+
public @interface RequiresAuthentication {
26+
27+
}

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresCookie.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/**
2+
* Copyright (C) 2010-2013 eBusiness Information, Excilys Group
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed To in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package org.androidannotations.annotations.rest;
17+
18+
import java.lang.annotation.ElementType;
19+
import java.lang.annotation.Retention;
20+
import java.lang.annotation.RetentionPolicy;
21+
import java.lang.annotation.Target;
22+
23+
@Retention(RetentionPolicy.CLASS)
24+
@Target({ ElementType.METHOD, ElementType.TYPE })
25+
public @interface RequiresCookie {
26+
public String[] value();
27+
}

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresCookieInUrl.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/**
2+
* Copyright (C) 2010-2013 eBusiness Information, Excilys Group
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed To in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package org.androidannotations.annotations.rest;
17+
18+
import java.lang.annotation.ElementType;
19+
import java.lang.annotation.Retention;
20+
import java.lang.annotation.RetentionPolicy;
21+
import java.lang.annotation.Target;
22+
23+
@Retention(RetentionPolicy.CLASS)
24+
@Target({ ElementType.METHOD, ElementType.TYPE })
25+
public @interface RequiresCookieInUrl {
26+
public String[] value();
27+
}

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/rest/RequiresHeader.java‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/**
2+
* Copyright (C) 2010-2013 eBusiness Information, Excilys Group
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
5+
* use this file except in compliance with the License. You may obtain a copy of
6+
* the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed To in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
12+
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
13+
* License for the specific language governing permissions and limitations under
14+
* the License.
15+
*/
16+
package org.androidannotations.annotations.rest;
17+
18+
import java.lang.annotation.ElementType;
19+
import java.lang.annotation.Retention;
20+
import java.lang.annotation.RetentionPolicy;
21+
import java.lang.annotation.Target;
22+
23+
@Retention(RetentionPolicy.CLASS)
24+
@Target({ ElementType.METHOD, ElementType.TYPE })
25+
public @interface RequiresHeader {
26+
String[] value();
27+
}

0 commit comments

Comments
 (0)