Skip to content

Commit 242b4dc

Browse files
pyricaupyricau
committed
Merge branch 'develop' into customTitle
2 parents f61c956 + f379a63 commit 242b4dc

170 files changed

Lines changed: 4723 additions & 711 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/.settings/org.eclipse.core.resources.prefs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
#Thu Oct 27 16:48:40 CEST 2011
21
eclipse.preferences.version=1
32
encoding/<project>=UTF-8

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
eclipse.preferences.version=1
22
encoding//src/main/java=UTF-8
3+
encoding//src/main/java/rebel.xml=UTF-8
34
encoding//src/test/java=UTF-8
45
encoding/<project>=UTF-8

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ Export-Package: org.androidannotations.annotations,
77
org.androidannotations.annotations.res,
88
org.androidannotations.annotations.rest,
99
org.androidannotations.annotations.sharedpreferences,
10-
org.androidannotations.api,
11-
org.androidannotations.api.rest,
12-
org.androidannotations.api.sharedpreferences
10+
org.androidannotations.api.rest
1311
Bundle-Vendor: androidannotations
1412
Bundle-Activator: org.androidannotations.api.Activator
1513
Bundle-RequiredExecutionEnvironment: JavaSE-1.6

‎AndroidAnnotations/androidannotations-api/build.properties‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
#
2+
# Copyright (C) 2010-2012 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+
117
source.. = src/main/java/,\
218
src/test/java/,\
319
src/main/eclipse/

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import java.lang.annotation.RetentionPolicy;
2121
import java.lang.annotation.Target;
2222

23-
import org.androidannotations.api.Scope;
24-
2523
/**
2624
* Should be used on custom classes to enable usage of AndroidAnnotations
2725
*
@@ -36,6 +34,20 @@
3634
@Target(ElementType.TYPE)
3735
public @interface EBean {
3836

37+
public enum Scope {
38+
39+
/**
40+
* A new instance of the bean is created each time it is needed
41+
*/
42+
Default, //
43+
44+
/**
45+
* A new instance of the bean is created the first time it is needed, it is
46+
* then retained and the same instance is always returned.
47+
*/
48+
Singleton, //
49+
}
50+
3951
Scope scope() default Scope.Default;
4052

4153
}

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package org.androidannotations.annotations;
2+
3+
import java.lang.annotation.ElementType;
4+
import java.lang.annotation.Retention;
5+
import java.lang.annotation.RetentionPolicy;
6+
import java.lang.annotation.Target;
7+
8+
/**
9+
* Use this annotation to enable the use of HierarchyViewer inside the
10+
* application.
11+
*
12+
* @author Thomas Fondrillon
13+
*/
14+
@Retention(RetentionPolicy.CLASS)
15+
@Target(ElementType.TYPE)
16+
public @interface HierarchyViewerSupport {
17+
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,5 @@
2525
public @interface Rest {
2626
String rootUrl() default "";
2727
Class<?>[] converters();
28+
Class<?>[] interceptors() default {};
2829
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import java.lang.annotation.RetentionPolicy;
2121
import java.lang.annotation.Target;
2222

23-
import org.androidannotations.api.sharedpreferences.SharedPreferencesHelper;
24-
2523
/**
2624
* Injects a {@link SharedPref}
2725
*

‎AndroidAnnotations/androidannotations-bundle/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.settings

‎AndroidAnnotations/androidannotations-with-codemodel/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.settings

0 commit comments

Comments
 (0)