androidannotations · DayS · Dec 16, 2013 · Jun 4, 2013 · May 22, 2013 · Jun 4, 2013
diff --git a/...s/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java b/...s/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java
diff --git a/.../androidannotations/src/main/java/org/androidannotations/generation/ApiCodeGenerator.java b/.../androidannotations/src/main/java/org/androidannotations/generation/ApiCodeGenerator.java
@@ -25,7 +25,7 @@
 import javax.lang.model.element.Element;
 import javax.tools.JavaFileObject;

-import org.androidannotations.processing.OriginatingElements;
+import org.androidannotations.process.OriginatingElements;

 public class ApiCodeGenerator {


diff --git a/...ndroidannotations/src/main/java/org/androidannotations/generation/CodeModelGenerator.java b/...ndroidannotations/src/main/java/org/androidannotations/generation/CodeModelGenerator.java
@@ -20,7 +20,7 @@
 import javax.annotation.processing.Filer;
 import javax.annotation.processing.Messager;

-import org.androidannotations.processing.ModelProcessor.ProcessResult;
+import org.androidannotations.process.ModelProcessor;

 import com.sun.codemodel.writer.PrologCodeWriter;

@@ -36,7 +36,7 @@ public CodeModelGenerator(Filer filer, Messager messager, String aaVersion) {
 		this.aaVersion = aaVersion;
 	}

-	public void generate(ProcessResult processResult) throws IOException {
+	public void generate(ModelProcessor.ProcessResult processResult) throws IOException {

 		ApiCodeGenerator apiCodeGenerator = new ApiCodeGenerator(filer);
 		apiCodeGenerator.writeApiClasses(processResult.apiClassesToGenerate, processResult.originatingElements);

diff --git a/.../androidannotations/src/main/java/org/androidannotations/generation/SourceCodewriter.java b/.../androidannotations/src/main/java/org/androidannotations/generation/SourceCodewriter.java
@@ -25,7 +25,7 @@
 import javax.tools.Diagnostic.Kind;
 import javax.tools.JavaFileObject;

-import org.androidannotations.processing.OriginatingElements;
+import org.androidannotations.process.OriginatingElements;

 import com.sun.codemodel.CodeWriter;
 import com.sun.codemodel.JPackage;

diff --git a/...roidannotations/src/main/java/org/androidannotations/handler/AbstractListenerHandler.java b/...roidannotations/src/main/java/org/androidannotations/handler/AbstractListenerHandler.java
@@ -0,0 +1,130 @@
+/**
+ * Copyright (C) 2010-2013 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.*;
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.holder.EComponentWithViewSupportHolder;
+import org.androidannotations.model.AndroidSystemServices;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.process.IsValid;
+import org.androidannotations.rclass.IRClass;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.VariableElement;
+import javax.lang.model.type.TypeMirror;
+import java.util.List;
+
+import static com.sun.codemodel.JExpr.*;
+
+public abstract class AbstractListenerHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
+
+	private IdAnnotationHelper helper;
+	private EComponentWithViewSupportHolder holder;
+	private String methodName;
+
+	public AbstractListenerHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
+		super(targetClass, processingEnvironment);
+	}
+
+	public AbstractListenerHandler(String target, ProcessingEnvironment processingEnvironment) {
+		super(target, processingEnvironment);
+	}
+
+	@Override
+	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
+		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
+		helper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	}
+
+	@Override
+	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+
+		validatorHelper.isNotPrivate(element, valid);
+
+		validatorHelper.doesntThrowException(element, valid);
+
+		validatorHelper.uniqueId(element, validatedElements, valid);
+	}
+
+	@Override
+	public void process(Element element, EComponentWithViewSupportHolder holder) {
+		this.holder = holder;
+		this.methodName = element.getSimpleName().toString();
+
+		ExecutableElement executableElement = (ExecutableElement) element;
+		List<? extends VariableElement> parameters = executableElement.getParameters();
+		TypeMirror returnType = executableElement.getReturnType();
+
+		List<JFieldRef> idsRefs = helper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);
+
+		JDefinedClass listenerAnonymousClass = codeModel().anonymousClass(getListenerClass());
+		JMethod listenerMethod = createListenerMethod(listenerAnonymousClass);
+		listenerMethod.annotate(Override.class);
+
+		JBlock listenerMethodBody = listenerMethod.body();
+
+		JExpression activityRef = holder.getGeneratedClass().staticRef("this");
+		JInvocation call = invoke(activityRef, methodName);
+
+		makeCall(listenerMethodBody, call, returnType);
+
+		processParameters(listenerMethod, call, parameters);
+
+		for (JFieldRef idRef : idsRefs) {
+            if (idRef != null) {
+                JBlock block = holder.getOnViewChangedBody().block();
+
+                JExpression findViewExpression = holder.findViewById(idRef);
+                if (!getViewClass().equals(classes().VIEW)) {
+                    findViewExpression = cast(getViewClass(), findViewExpression);
+                }
+
+                JVar view = block.decl(getViewClass(), "view", findViewExpression);
+                block._if(view.ne(_null()))._then().invoke(view, getSetterName()).arg(_new(listenerAnonymousClass));
+            }
+		}
+	}
+
+	protected abstract void makeCall(JBlock listenerMethodBody, JInvocation call, TypeMirror returnType);
+
+	protected abstract void processParameters(JMethod listenerMethod, JInvocation call, List<? extends VariableElement> userParameters);
+
+	protected abstract JMethod createListenerMethod(JDefinedClass listenerAnonymousClass);
+
+	protected abstract String getSetterName();
+
+	protected abstract JClass getListenerClass();
+
+	protected JType getViewClass() {
+		return classes().VIEW;
+	}
+
+	protected String getMethodName() {
+		return methodName;
+	}
+
+	protected final EComponentWithViewSupportHolder getHolder() {
+		return holder;
+	}
+}
diff --git a/...tations/validation/RunnableValidator.java → ...ions/handler/AbstractRunnableHandler.java b/...tations/validation/RunnableValidator.java → ...ions/handler/AbstractRunnableHandler.java
@@ -13,37 +13,24 @@
 * License for the specific language governing permissions and limitations under
 * the License.
 */
-package org.androidannotations.validation;
+package org.androidannotations.handler;

 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;

-import org.androidannotations.helper.TargetAnnotationHelper;
-import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.holder.EComponentHolder;
 import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.process.IsValid;

-public class RunnableValidator implements ElementValidator {
+public abstract class AbstractRunnableHandler extends BaseAnnotationHandler<EComponentHolder> {

-	private final String annotationName;
-	private ValidatorHelper validatorHelper;
-
-	public RunnableValidator(String annotationName, ProcessingEnvironment processingEnv) {
-		this.annotationName = annotationName;
-		TargetAnnotationHelper annotationHelper = new TargetAnnotationHelper(processingEnv, getTarget());
-		validatorHelper = new ValidatorHelper(annotationHelper);
-	}
-
-	@Override
-	public String getTarget() {
-		return annotationName;
+	public AbstractRunnableHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
+		super(targetClass, processingEnvironment);
 	}

 	@Override
-	public boolean validate(Element element, AnnotationElements validatedElements) {
-
-		IsValid valid = new IsValid();
-
+	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
 		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);

 		ExecutableElement executableElement = (ExecutableElement) element;
@@ -57,8 +44,5 @@ public boolean validate(Element element, AnnotationElements validatedElements) {
 		validatorHelper.isNotFinal(element, valid);

 		validatorHelper.isNotSynchronized(element, valid);
-
-		return valid.isValid();
 	}
-
 }
diff --git a/...annotations/src/main/java/org/androidannotations/handler/AbstractSeekBarTouchHandler.java b/...annotations/src/main/java/org/androidannotations/handler/AbstractSeekBarTouchHandler.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (C) 2010-2013 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 java.util.List;
+
+import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.Element;
+import javax.lang.model.element.ExecutableElement;
+import javax.lang.model.element.VariableElement;
+
+import org.androidannotations.helper.AndroidManifest;
+import org.androidannotations.helper.IdAnnotationHelper;
+import org.androidannotations.helper.IdValidatorHelper;
+import org.androidannotations.holder.EComponentWithViewSupportHolder;
+import org.androidannotations.holder.OnSeekBarChangeListenerHolder;
+import org.androidannotations.model.AndroidSystemServices;
+import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.process.IsValid;
+import org.androidannotations.rclass.IRClass;
+
+import com.sun.codemodel.JBlock;
+import com.sun.codemodel.JExpression;
+import com.sun.codemodel.JFieldRef;
+import com.sun.codemodel.JInvocation;
+import com.sun.codemodel.JVar;
+
+public abstract class AbstractSeekBarTouchHandler extends BaseAnnotationHandler<EComponentWithViewSupportHolder> {
+
+	private IdAnnotationHelper annotationHelper;
+
+	public AbstractSeekBarTouchHandler(Class<?> targetClass, ProcessingEnvironment processingEnvironment) {
+		super(targetClass, processingEnvironment);
+	}
+
+	@Override
+	public void setAndroidEnvironment(IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) {
+		super.setAndroidEnvironment(rClass, androidSystemServices, androidManifest);
+		annotationHelper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
+	}
+
+	@Override
+	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
+		validatorHelper.enclosingElementHasEnhancedViewSupportAnnotation(element, validatedElements, valid);
+
+		validatorHelper.resIdsExist(element, IRClass.Res.ID, IdValidatorHelper.FallbackStrategy.USE_ELEMENT_NAME, valid);
+
+		validatorHelper.isNotPrivate(element, valid);
+
+		validatorHelper.doesntThrowException(element, valid);
+
+		validatorHelper.returnTypeIsVoid((ExecutableElement) element, valid);
+
+		validatorHelper.hasSeekBarTouchTrackingMethodParameters((ExecutableElement) element, valid);
+	}
+
+	@Override
+	public void process(Element element, EComponentWithViewSupportHolder holder) throws Exception {
+		String methodName = element.getSimpleName().toString();
+
+		List<JFieldRef> idsRefs = annotationHelper.extractAnnotationFieldRefs(processHolder, element, IRClass.Res.ID, true);
+
+		for (JFieldRef idRef : idsRefs) {
+			OnSeekBarChangeListenerHolder onSeekBarChangeListenerHolder = holder.getOnSeekBarChangeListenerHolder(idRef);
+			JBlock methodBody = getMethodBodyToCall(onSeekBarChangeListenerHolder);
+
+			JExpression activityRef = holder.getGeneratedClass().staticRef("this");
+			JInvocation textChangeCall = methodBody.invoke(activityRef, methodName);
+
+			ExecutableElement executableElement = (ExecutableElement) element;
+			List<? extends VariableElement> parameters = executableElement.getParameters();
+
+			if (parameters.size() == 1) {
+				JVar progressParameter = getMethodParamToPass(onSeekBarChangeListenerHolder);
+				textChangeCall.arg(progressParameter);
+			}
+		}
+	}
+
+	protected abstract JBlock getMethodBodyToCall(OnSeekBarChangeListenerHolder onSeekBarChangeListenerHolder);
+
+	protected abstract JVar getMethodParamToPass(OnSeekBarChangeListenerHolder onSeekBarChangeListenerHolder);
+}
diff --git a/...ions/validation/AfterInjectValidator.java → ...notations/handler/AfterInjectHandler.java b/...ions/validation/AfterInjectValidator.java → ...notations/handler/AfterInjectHandler.java
@@ -13,36 +13,25 @@
 * License for the specific language governing permissions and limitations under
 * the License.
 */
-package org.androidannotations.validation;
+package org.androidannotations.handler;

 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ExecutableElement;

 import org.androidannotations.annotations.AfterInject;
-import org.androidannotations.helper.TargetAnnotationHelper;
-import org.androidannotations.helper.ValidatorHelper;
+import org.androidannotations.holder.EComponentHolder;
 import org.androidannotations.model.AnnotationElements;
+import org.androidannotations.process.IsValid;

-public class AfterInjectValidator implements ElementValidator {
+public class AfterInjectHandler extends BaseAnnotationHandler<EComponentHolder> {

-	private ValidatorHelper validatorHelper;
-
-	public AfterInjectValidator(ProcessingEnvironment processingEnv) {
-		TargetAnnotationHelper annotationHelper = new TargetAnnotationHelper(processingEnv, getTarget());
-		validatorHelper = new ValidatorHelper(annotationHelper);
+	public AfterInjectHandler(ProcessingEnvironment processingEnvironment) {
+		super(AfterInject.class, processingEnvironment);
 	}

 	@Override
-	public String getTarget() {
-		return AfterInject.class.getName();
-	}
-
-	@Override
-	public boolean validate(Element element, AnnotationElements validatedElements) {
-
-		IsValid valid = new IsValid();
-
+	public void validate(Element element, AnnotationElements validatedElements, IsValid valid) {
 		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validatedElements, valid);

 		ExecutableElement executableElement = (ExecutableElement) element;
@@ -54,8 +43,11 @@ public boolean validate(Element element, AnnotationElements validatedElements) {
 		validatorHelper.doesntThrowException(executableElement, valid);

 		validatorHelper.param.zeroParameter(executableElement, valid);
-
-		return valid.isValid();
 	}

+	@Override
+	public void process(Element element, EComponentHolder holder) {
+		String methodName = element.getSimpleName().toString();
+		holder.getInitBody().invoke(methodName);
+	}
 }