Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

fix: reformatting SupposeThread-feature classes #1119

Merged
WonderCsabo merged 1 commit into from
Aug 31, 2014
Merged

fix: reformatting SupposeThread-feature classes #1119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 36 additions & 21 deletions ...oidannotations/src/main/java/org/androidannotations/handler/SupposeBackgroundHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2010-2014 eBusiness Information, Excilys Group
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.handler;

import com.sun.codemodel.JBlock;
Expand All @@ -18,32 +33,32 @@

public class SupposeBackgroundHandler extends SupposeThreadHandler {

private static final String METHOD_CHECK_BG_THREAD = "checkBgThread";
private static final String METHOD_CHECK_BG_THREAD = "checkBgThread";

private final APTCodeModelHelper helper = new APTCodeModelHelper();
private final APTCodeModelHelper helper = new APTCodeModelHelper();

public SupposeBackgroundHandler(ProcessingEnvironment processingEnvironment) {
super(SupposeBackground.class, processingEnvironment);
}
public SupposeBackgroundHandler(ProcessingEnvironment processingEnvironment) {
super(SupposeBackground.class, processingEnvironment);
}

@Override
public void process(Element element, EComponentHolder holder) throws Exception {
ExecutableElement executableElement = (ExecutableElement) element;
@Override
public void process(Element element, EComponentHolder holder) throws Exception {
ExecutableElement executableElement = (ExecutableElement) element;

JMethod delegatingMethod = helper.overrideAnnotatedMethod(executableElement, holder);
JMethod delegatingMethod = helper.overrideAnnotatedMethod(executableElement, holder);

JClass bgExecutor = refClass(BackgroundExecutor.class);
JClass bgExecutor = refClass(BackgroundExecutor.class);

SupposeBackground annotation = element.getAnnotation(SupposeBackground.class);
String[] serial = annotation.serial();
JInvocation invocation = bgExecutor.staticInvoke(METHOD_CHECK_BG_THREAD);
for (String s : serial) {
invocation.arg(lit(s));
}
SupposeBackground annotation = element.getAnnotation(SupposeBackground.class);
String[] serial = annotation.serial();
JInvocation invocation = bgExecutor.staticInvoke(METHOD_CHECK_BG_THREAD);
for (String s : serial) {
invocation.arg(lit(s));
}

JBlock body = delegatingMethod.body();
body.pos(0);
body.add(invocation);
body.pos(body.getContents().size());
}
JBlock body = delegatingMethod.body();
body.pos(0);
body.add(invocation);
body.pos(body.getContents().size());
}
}
31 changes: 23 additions & 8 deletions ...androidannotations/src/main/java/org/androidannotations/handler/SupposeThreadHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2010-2014 eBusiness Information, Excilys Group
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.handler;

import org.androidannotations.holder.EComponentHolder;
Expand All @@ -9,14 +24,14 @@

public abstract class SupposeThreadHandler extends BaseAnnotationHandler<EComponentHolder> {

public SupposeThreadHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
super(targetClass, processingEnvironment);
}
public SupposeThreadHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
super(targetClass, processingEnvironment);
}

@Override
protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
validatorHelper.isNotPrivate(element, valid);
}
@Override
protected void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);
validatorHelper.isNotPrivate(element, valid);
}

}
45 changes: 30 additions & 15 deletions ...droidannotations/src/main/java/org/androidannotations/handler/SupposeUiThreadHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2010-2014 eBusiness Information, Excilys Group
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.handler;

import com.sun.codemodel.JBlock;
Expand All @@ -15,25 +30,25 @@

public class SupposeUiThreadHandler extends SupposeThreadHandler {

private static final String METHOD_CHECK_UI_THREAD = "checkUiThread";
private static final String METHOD_CHECK_UI_THREAD = "checkUiThread";

private final APTCodeModelHelper helper = new APTCodeModelHelper();
private final APTCodeModelHelper helper = new APTCodeModelHelper();

public SupposeUiThreadHandler(ProcessingEnvironment processingEnvironment) {
super(SupposeUiThread.class, processingEnvironment);
}
public SupposeUiThreadHandler(ProcessingEnvironment processingEnvironment) {
super(SupposeUiThread.class, processingEnvironment);
}

@Override
public void process(Element element, EComponentHolder holder) throws Exception {
ExecutableElement executableElement = (ExecutableElement) element;
@Override
public void process(Element element, EComponentHolder holder) throws Exception {
ExecutableElement executableElement = (ExecutableElement) element;

JMethod delegatingMethod = helper.overrideAnnotatedMethod(executableElement, holder);
JBlock body = delegatingMethod.body();
JMethod delegatingMethod = helper.overrideAnnotatedMethod(executableElement, holder);
JBlock body = delegatingMethod.body();

JClass bgExecutor = refClass(BackgroundExecutor.class);
JClass bgExecutor = refClass(BackgroundExecutor.class);

body.pos(0);
body.staticInvoke(bgExecutor, METHOD_CHECK_UI_THREAD);
body.pos(body.getContents().size());
}
body.pos(0);
body.staticInvoke(bgExecutor, METHOD_CHECK_UI_THREAD);
body.pos(body.getContents().size());
}
}