Removing the warning when a receiver is not registered. androidannotations#123

pyricau · pyricau · commit 38ce56b73ac0 · 2012-03-06T16:04:12.000+01:00
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/ValidatorHelper.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/helper/ValidatorHelper.java
@@ -949,6 +949,10 @@ private boolean isKnowInstanceStateType(String type) {
 	}
 
 	public void componentRegistered(Element element, AndroidManifest androidManifest, IsValid valid) {
+		componentRegistered(element, androidManifest, true, valid);
+	}
+
+	public void componentRegistered(Element element, AndroidManifest androidManifest, boolean printWarning, IsValid valid) {
 		TypeElement typeElement = (TypeElement) element;
 
 		if (typeElement.getModifiers().contains(Modifier.ABSTRACT)) {
@@ -966,7 +970,9 @@ public void componentRegistered(Element element, AndroidManifest androidManifest
 				valid.invalidate();
 				annotationHelper.printAnnotationError(element, "The AndroidManifest.xml file contains the original component, and not the AndroidAnnotations generated component. Please register " + generatedSimpleName + " instead of " + simpleName);
 			} else {
-				annotationHelper.printAnnotationWarning(element, "The component " + generatedSimpleName + " is not registered in the AndroidManifest.xml file.");
+				if (printWarning) {
+					annotationHelper.printAnnotationWarning(element, "The component " + generatedSimpleName + " is not registered in the AndroidManifest.xml file.");
+				}
 			}
 		}
 
diff --git a/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EReceiverValidator.java b/AndroidAnnotations/androidannotations/src/main/java/com/googlecode/androidannotations/validation/EReceiverValidator.java
@@ -54,7 +54,8 @@ public boolean validate(Element element, AnnotationElements validatedElements) {
 		
 		validatorHelper.isNotAbstract(element, valid);
 
-		validatorHelper.componentRegistered(element, androidManifest, valid);
+		final boolean NO_WARNING = false;
+		validatorHelper.componentRegistered(element, androidManifest, NO_WARNING, valid);
 
 		return valid.isValid();
 	}
diff --git a/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml b/AndroidAnnotations/functional-test-1-5/AndroidManifest.xml
@@ -59,6 +59,7 @@
         <activity android:name="com.googlecode.androidannotations.test15.instancestate.SaveInstanceStateActivity_" />
         <activity android:name="com.googlecode.androidannotations.test15.afterinject.AfterInjectActivity_" />
 		<activity android:name="com.googlecode.androidannotations.test15.greendroid.MyGreenDroidActivity_" />
+		
         <receiver android:name="com.googlecode.androidannotations.test15.ereceiver.MyReceiver_" />
 
         <provider
diff --git a/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ereceiver/MyReceiver.java b/AndroidAnnotations/functional-test-1-5/src/main/java/com/googlecode/androidannotations/test15/ereceiver/MyReceiver.java
@@ -45,7 +45,8 @@ public void onReceive(Context context, Intent intent) {
 		showToast(context);
 		workInBackground();
 	}
-	
+
+
 	@Trace
 	@UiThread
 	void showToast(Context context) {

Original file line number	Diff line number	Diff line change
`@@ -949,6 +949,10 @@ private boolean isKnowInstanceStateType(String type) {`
`949`	`949`	`}`
`950`	`950`
`951`	`951`	`public void componentRegistered(Element element, AndroidManifest androidManifest, IsValid valid) {`
	`952`	`+ componentRegistered(element, androidManifest, true, valid);`
	`953`	`+ }`
	`954`	`+`
	`955`	`+ public void componentRegistered(Element element, AndroidManifest androidManifest, boolean printWarning, IsValid valid) {`
`952`	`956`	`TypeElement typeElement = (TypeElement) element;`
`953`	`957`
`954`	`958`	`if (typeElement.getModifiers().contains(Modifier.ABSTRACT)) {`
`@@ -966,7 +970,9 @@ public void componentRegistered(Element element, AndroidManifest androidManifest`
`966`	`970`	`valid.invalidate();`
`967`	`971`	`annotationHelper.printAnnotationError(element, "The AndroidManifest.xml file contains the original component, and not the AndroidAnnotations generated component. Please register " + generatedSimpleName + " instead of " + simpleName);`
`968`	`972`	`} else {`
`969`		`- annotationHelper.printAnnotationWarning(element, "The component " + generatedSimpleName + " is not registered in the AndroidManifest.xml file.");`
	`973`	`+ if (printWarning) {`
	`974`	`+ annotationHelper.printAnnotationWarning(element, "The component " + generatedSimpleName + " is not registered in the AndroidManifest.xml file.");`
	`975`	`+ }`
`970`	`976`	`}`
`971`	`977`	`}`
`972`	`978`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ public boolean validate(Element element, AnnotationElements validatedElements) {`
`54`	`54`
`55`	`55`	`validatorHelper.isNotAbstract(element, valid);`
`56`	`56`
`57`		`- validatorHelper.componentRegistered(element, androidManifest, valid);`
	`57`	`+ final boolean NO_WARNING = false;`
	`58`	`+ validatorHelper.componentRegistered(element, androidManifest, NO_WARNING, valid);`
`58`	`59`
`59`	`60`	`return valid.isValid();`
`60`	`61`	`}`