diff --git a/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF b/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF index 938a5ccecb..66b7ebe036 100644 --- a/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF +++ b/AndroidAnnotations/androidannotations-api/META-INF/MANIFEST.MF @@ -7,6 +7,7 @@ Export-Package: org.androidannotations.annotations, org.androidannotations.annotations.res, org.androidannotations.annotations.rest, org.androidannotations.annotations.sharedpreferences, + org.androidannotations.api, org.androidannotations.api.rest, org.androidannotations.api.sharedpreferences, org.androidannotations.api.view diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/BackgroundExecutor.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java similarity index 100% rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/BackgroundExecutor.java rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/BackgroundExecutor.java diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/SdkVersionHelper.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/SdkVersionHelper.java similarity index 100% rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/SdkVersionHelper.java rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/SdkVersionHelper.java diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/ViewServer.java b/AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java similarity index 100% rename from AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/api/ViewServer.java rename to AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/ViewServer.java diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BackgroundHandler.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BackgroundHandler.java index 2e46716a01..0157ccfb53 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BackgroundHandler.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/BackgroundHandler.java @@ -24,7 +24,6 @@ import org.androidannotations.annotations.Background; import org.androidannotations.api.BackgroundExecutor; -import org.androidannotations.api.BackgroundExecutor.Task; import org.androidannotations.helper.APTCodeModelHelper; import org.androidannotations.holder.EComponentHolder; @@ -51,13 +50,11 @@ public BackgroundHandler(ProcessingEnvironment processingEnvironment) { public void process(Element element, EComponentHolder holder) throws Exception { ExecutableElement executableElement = (ExecutableElement) element; - generateApiClass(element, BackgroundExecutor.class); - JMethod delegatingMethod = codeModelHelper.overrideAnnotatedMethod(executableElement, holder); JBlock previousMethodBody = codeModelHelper.removeBody(delegatingMethod); - JDefinedClass anonymousTaskClass = codeModel().anonymousClass(Task.class); + JDefinedClass anonymousTaskClass = codeModel().anonymousClass(BackgroundExecutor.Task.class); JMethod executeMethod = anonymousTaskClass.method(JMod.PUBLIC, codeModel().VOID, "execute"); executeMethod.annotate(Override.class); @@ -67,10 +64,10 @@ public void process(Element element, EComponentHolder holder) throws Exception { tryBlock.body().add(previousMethodBody); JCatchBlock catchBlock = tryBlock._catch(holder.classes().THROWABLE); JVar caughtException = catchBlock.param("e"); - JStatement uncaughtExceptionCall = holder.classes().THREAD - .staticInvoke("getDefaultUncaughtExceptionHandler") - .invoke("uncaughtException") - .arg(holder.classes().THREAD.staticInvoke("currentThread")) + JStatement uncaughtExceptionCall = holder.classes().THREAD // + .staticInvoke("getDefaultUncaughtExceptionHandler") // + .invoke("uncaughtException") // + .arg(holder.classes().THREAD.staticInvoke("currentThread")) // .arg(caughtException); catchBlock.body().add(uncaughtExceptionCall); diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HierarchyViewerSupportHandler.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HierarchyViewerSupportHandler.java index 16ea979599..e872969de3 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HierarchyViewerSupportHandler.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/HierarchyViewerSupportHandler.java @@ -21,7 +21,6 @@ import javax.lang.model.element.Element; import org.androidannotations.annotations.HierarchyViewerSupport; -import org.androidannotations.api.ViewServer; import org.androidannotations.holder.EActivityHolder; import org.androidannotations.model.AnnotationElements; import org.androidannotations.process.IsValid; @@ -45,8 +44,6 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa @Override public void process(Element element, EActivityHolder holder) throws Exception { - generateApiClass(element, ViewServer.class); - JInvocation viewServerInvocation = classes().VIEW_SERVER.staticInvoke("get").arg(_this()); holder.getOnViewChangedBody().invoke(viewServerInvocation, "addWindow").arg(_this()); diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java index 2b30d0a02f..16ff7689fb 100644 --- a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java +++ b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/EActivityHolder.java @@ -62,7 +62,7 @@ public class EActivityHolder extends EComponentWithViewSupportHolder implements HasIntentBuilder, HasExtras, HasInstanceState, HasOptionsMenu, HasOnActivityResult { private GreenDroidHelper greenDroidHelper; - private ActivityIntentBuilder intentBuilder; + private ActivityIntentBuilder intentBuilder; private JMethod onCreate; private JMethod setIntent; private JMethod setContentViewLayout; @@ -95,8 +95,8 @@ public EActivityHolder(ProcessHolder processHolder, TypeElement annotatedElement instanceStateHolder = new InstanceStateHolder(this); onActivityResultHolder = new OnActivityResultHolder(this); setSetContentView(); - intentBuilder = new ActivityIntentBuilder(this, androidManifest); - intentBuilder.build(); + intentBuilder = new ActivityIntentBuilder(this, androidManifest); + intentBuilder.build(); handleBackPressed(); } @@ -196,7 +196,7 @@ protected void setOnStop() { method.annotate(Override.class); JBlock body = method.body(); body.invoke(_super(), method); - getRoboGuiceHolder().onStop = method; + getRoboGuiceHolder().onStop = method; } protected void setOnDestroy() { @@ -361,8 +361,6 @@ private void handleBackPressed() { Element declaredOnBackPressedMethod = getOnBackPressedMethod(annotatedElement); if (declaredOnBackPressedMethod != null) { - processHolder.generateApiClass(declaredOnBackPressedMethod, SdkVersionHelper.class); - JMethod onKeyDownMethod = generatedClass.method(PUBLIC, codeModel().BOOLEAN, "onKeyDown"); onKeyDownMethod.annotate(Override.class); JVar keyCodeParam = onKeyDownMethod.param(codeModel().INT, "keyCode"); @@ -418,12 +416,12 @@ private boolean isCustomOnBackPressedMethod(ExecutableElement method) { ; } - @Override - public IntentBuilder getIntentBuilder() { - return intentBuilder; - } + @Override + public IntentBuilder getIntentBuilder() { + return intentBuilder; + } - @Override + @Override public void setIntentBuilderClass(JDefinedClass intentBuilderClass) { this.intentBuilderClass = intentBuilderClass; } diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackPressedApiDependenciesTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackPressedApiDependenciesTest.java index e5504280f5..833aca67e1 100644 --- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackPressedApiDependenciesTest.java +++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackPressedApiDependenciesTest.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.androidannotations.AndroidAnnotationProcessor; -import org.androidannotations.api.SdkVersionHelper; import org.androidannotations.utils.AAProcessorTestHelper; import org.junit.Before; import org.junit.Test; @@ -35,14 +34,12 @@ public void setup() { @Test public void activity_with_on_back_pressed_generate_api_dependency() throws IOException { CompileResult result = compileFiles(ActivityWithOnBackPressedMethod.class); - assertClassSourcesGeneratedToOutput(SdkVersionHelper.class); assertCompilationSuccessful(result); } @Test public void activity_without_on_back_pressed_do_not_generate_api_dependency() throws IOException { CompileResult result = compileFiles(ActivityWithBackgroundMethod.class); - assertClassSourcesNotGeneratedToOutput(SdkVersionHelper.class); assertCompilationSuccessful(result); } diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackgroundApiDependenciesTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackgroundApiDependenciesTest.java index f362960897..c34bfe2ffe 100644 --- a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackgroundApiDependenciesTest.java +++ b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackgroundApiDependenciesTest.java @@ -18,7 +18,6 @@ import java.io.IOException; import org.androidannotations.AndroidAnnotationProcessor; -import org.androidannotations.api.BackgroundExecutor; import org.androidannotations.utils.AAProcessorTestHelper; import org.junit.Before; import org.junit.Test; @@ -35,14 +34,12 @@ public void setup() { @Test public void activity_with_background_annotated_method_generate_api_dependency() throws IOException { CompileResult result = compileFiles(ActivityWithBackgroundMethod.class); - assertClassSourcesGeneratedToOutput(BackgroundExecutor.class); assertCompilationSuccessful(result); } @Test public void activity_without_background_annotated_method_generate_api_dependency() throws IOException { CompileResult result = compileFiles(ActivityWithOnBackPressedMethod.class); - assertClassSourcesNotGeneratedToOutput(BackgroundExecutor.class); assertCompilationSuccessful(result); }