Skip to content

Commit 697d2ba

Browse files
pyricaupyricau
committed
Merge branch 'develop' into holoeverywhere
2 parents 189b9d9 + bda98b6 commit 697d2ba

105 files changed

Lines changed: 3479 additions & 481 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/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-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

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
import org.androidannotations.annotations.FragmentByTag;
5656
import org.androidannotations.annotations.FromHtml;
5757
import org.androidannotations.annotations.Fullscreen;
58+
import org.androidannotations.annotations.HierarchyViewerSupport;
5859
import org.androidannotations.annotations.HttpsClient;
5960
import org.androidannotations.annotations.InstanceState;
6061
import org.androidannotations.annotations.ItemClick;
@@ -140,6 +141,7 @@
140141
import org.androidannotations.processing.FragmentByTagProcessor;
141142
import org.androidannotations.processing.FromHtmlProcessor;
142143
import org.androidannotations.processing.FullscreenProcessor;
144+
import org.androidannotations.processing.HierarchyViewerSupportProcessor;
143145
import org.androidannotations.processing.HttpsClientProcessor;
144146
import org.androidannotations.processing.InstanceStateProcessor;
145147
import org.androidannotations.processing.ItemClickProcessor;
@@ -204,6 +206,7 @@
204206
import org.androidannotations.validation.FragmentByTagValidator;
205207
import org.androidannotations.validation.FromHtmlValidator;
206208
import org.androidannotations.validation.FullscreenValidator;
209+
import org.androidannotations.validation.HierarchyViewerSupportValidator;
207210
import org.androidannotations.validation.HttpsClientValidator;
208211
import org.androidannotations.validation.InstanceStateValidator;
209212
import org.androidannotations.validation.ItemClickValidator;
@@ -316,7 +319,8 @@
316319
OrmLiteDao.class, //
317320
HttpsClient.class, //
318321
FragmentArg.class, //
319-
OnActivityResult.class //
322+
OnActivityResult.class, //
323+
HierarchyViewerSupport.class //
320324
})
321325
@SupportedSourceVersion(SourceVersion.RELEASE_6)
322326
public class AndroidAnnotationProcessor extends AnnotatedAbstractProcessor {
@@ -461,7 +465,7 @@ private ModelValidator buildModelValidator(IRClass rClass, AndroidSystemServices
461465
modelValidator.register(new SystemServiceValidator(processingEnv, androidSystemServices));
462466
modelValidator.register(new SharedPrefValidator(processingEnv));
463467
modelValidator.register(new PrefValidator(processingEnv));
464-
modelValidator.register(new RestValidator(processingEnv));
468+
modelValidator.register(new RestValidator(processingEnv, androidManifest));
465469
modelValidator.register(new DeleteValidator(processingEnv));
466470
modelValidator.register(new GetValidator(processingEnv));
467471
modelValidator.register(new HeadValidator(processingEnv));
@@ -497,6 +501,7 @@ private ModelValidator buildModelValidator(IRClass rClass, AndroidSystemServices
497501
modelValidator.register(new OrmLiteDaoValidator(processingEnv, rClass));
498502
modelValidator.register(new HttpsClientValidator(processingEnv, rClass));
499503
modelValidator.register(new OnActivityResultValidator(processingEnv, rClass));
504+
modelValidator.register(new HierarchyViewerSupportValidator(processingEnv, androidManifest));
500505
return modelValidator;
501506
}
502507

@@ -549,14 +554,14 @@ private ModelProcessor buildModelProcessor(IRClass rClass, AndroidSystemServices
549554
modelProcessor.register(new ExtraProcessor(processingEnv));
550555
modelProcessor.register(new FragmentArgProcessor(processingEnv));
551556
modelProcessor.register(new SystemServiceProcessor(androidSystemServices));
552-
RestImplementationsHolder restImplementationHolder = new RestImplementationsHolder();
553-
modelProcessor.register(new RestProcessor(processingEnv, restImplementationHolder));
554-
modelProcessor.register(new GetProcessor(processingEnv, restImplementationHolder));
555-
modelProcessor.register(new PostProcessor(processingEnv, restImplementationHolder));
556-
modelProcessor.register(new PutProcessor(processingEnv, restImplementationHolder));
557-
modelProcessor.register(new DeleteProcessor(processingEnv, restImplementationHolder));
558-
modelProcessor.register(new HeadProcessor(processingEnv, restImplementationHolder));
559-
modelProcessor.register(new OptionsProcessor(processingEnv, restImplementationHolder));
557+
RestImplementationsHolder restImplementationsHolder = new RestImplementationsHolder();
558+
modelProcessor.register(new RestProcessor(processingEnv, restImplementationsHolder));
559+
modelProcessor.register(new GetProcessor(processingEnv, restImplementationsHolder));
560+
modelProcessor.register(new PostProcessor(processingEnv, restImplementationsHolder));
561+
modelProcessor.register(new PutProcessor(processingEnv, restImplementationsHolder));
562+
modelProcessor.register(new DeleteProcessor(processingEnv, restImplementationsHolder));
563+
modelProcessor.register(new HeadProcessor(processingEnv, restImplementationsHolder));
564+
modelProcessor.register(new OptionsProcessor(processingEnv, restImplementationsHolder));
560565
modelProcessor.register(new AppProcessor());
561566
modelProcessor.register(new OptionsMenuProcessor(processingEnv, rClass));
562567
modelProcessor.register(new OptionsItemProcessor(processingEnv, rClass));
@@ -587,6 +592,7 @@ private ModelProcessor buildModelProcessor(IRClass rClass, AndroidSystemServices
587592
modelProcessor.register(new InstanceStateProcessor(processingEnv));
588593
modelProcessor.register(new HttpsClientProcessor(rClass));
589594
modelProcessor.register(new OnActivityResultProcessor(processingEnv, rClass));
595+
modelProcessor.register(new HierarchyViewerSupportProcessor());
590596
return modelProcessor;
591597
}
592598

0 commit comments

Comments
 (0)