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

Introducing a new resName parameter to add library suppor... #237

Merged
pyricau merged 1 commit into from
Jun 25, 2012
Merged

Introducing a new resName parameter to add library suppor... #237

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
10 changes: 5 additions & 5 deletions ...notations/src/main/java/com/googlecode/androidannotations/AndroidAnnotationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,25 +481,25 @@ private ModelProcessor buildModelProcessor(IRClass rClass, AndroidSystemServices
modelProcessor.register(new EServiceProcessor());
modelProcessor.register(new EReceiverProcessor());
modelProcessor.register(new EProviderProcessor());
modelProcessor.register(new EFragmentProcessor(rClass));
modelProcessor.register(new EViewGroupProcessor(rClass));
modelProcessor.register(new EFragmentProcessor(processingEnv, rClass));
modelProcessor.register(new EViewGroupProcessor(processingEnv, rClass));
modelProcessor.register(new EViewProcessor());
modelProcessor.register(new EBeanProcessor());
modelProcessor.register(new SharedPrefProcessor());
modelProcessor.register(new PrefProcessor(validatedModel));
modelProcessor.register(new RoboGuiceProcessor());
modelProcessor.register(new ViewByIdProcessor(rClass));
modelProcessor.register(new ViewByIdProcessor(processingEnv, rClass));
modelProcessor.register(new FragmentByIdProcessor(processingEnv, rClass));
modelProcessor.register(new FragmentByTagProcessor(processingEnv));
modelProcessor.register(new FromHtmlProcessor(rClass));
modelProcessor.register(new FromHtmlProcessor(processingEnv, rClass));
modelProcessor.register(new ClickProcessor(processingEnv, rClass));
modelProcessor.register(new LongClickProcessor(processingEnv, rClass));
modelProcessor.register(new TouchProcessor(processingEnv, rClass));
modelProcessor.register(new ItemClickProcessor(processingEnv, rClass));
modelProcessor.register(new ItemSelectedProcessor(processingEnv, rClass));
modelProcessor.register(new ItemLongClickProcessor(processingEnv, rClass));
for (AndroidRes androidRes : AndroidRes.values()) {
modelProcessor.register(new ResProcessor(androidRes, rClass));
modelProcessor.register(new ResProcessor(processingEnv, androidRes, rClass));
}
modelProcessor.register(new TransactionalProcessor());
modelProcessor.register(new ExtraProcessor(processingEnv));
Expand Down
4 changes: 3 additions & 1 deletion ...otations/src/main/java/com/googlecode/androidannotations/annotations/AfterTextChange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
@Target(ElementType.METHOD)
public @interface AfterTextChange {

int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";

}
4 changes: 3 additions & 1 deletion ...tations/src/main/java/com/googlecode/androidannotations/annotations/BeforeTextChange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@
@Target(ElementType.METHOD)
public @interface BeforeTextChange {

int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";

}
4 changes: 3 additions & 1 deletion ...androidannotations/src/main/java/com/googlecode/androidannotations/annotations/Click.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
@Target(ElementType.METHOD)
public @interface Click {

int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";

}
4 changes: 3 additions & 1 deletion ...oidannotations/src/main/java/com/googlecode/androidannotations/annotations/EActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE)
public @interface EActivity {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
4 changes: 3 additions & 1 deletion ...oidannotations/src/main/java/com/googlecode/androidannotations/annotations/EFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE)
public @interface EFragment {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
4 changes: 3 additions & 1 deletion ...idannotations/src/main/java/com/googlecode/androidannotations/annotations/EViewGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE)
public @interface EViewGroup {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
4 changes: 3 additions & 1 deletion ...annotations/src/main/java/com/googlecode/androidannotations/annotations/FragmentById.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface FragmentById {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
4 changes: 3 additions & 1 deletion ...roidannotations/src/main/java/com/googlecode/androidannotations/annotations/FromHtml.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface FromHtml {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
4 changes: 2 additions & 2 deletions ...dannotations/src/main/java/com/googlecode/androidannotations/annotations/HttpsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
public @interface HttpsClient {
public static final String DEFAULT_PASSWD = "changeit";

int trustStore() default Id.DEFAULT_VALUE;
int trustStore() default ResId.DEFAULT_VALUE;

String trustStorePwd() default DEFAULT_PASSWD;

int keyStore() default Id.DEFAULT_VALUE;
int keyStore() default ResId.DEFAULT_VALUE;

String keyStorePwd() default DEFAULT_PASSWD;

Expand Down
4 changes: 3 additions & 1 deletion ...oidannotations/src/main/java/com/googlecode/androidannotations/annotations/ItemClick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.METHOD)
public @interface ItemClick {
int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";
}
4 changes: 3 additions & 1 deletion ...nnotations/src/main/java/com/googlecode/androidannotations/annotations/ItemLongClick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.METHOD)
public @interface ItemLongClick {
int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";
}
4 changes: 3 additions & 1 deletion ...idannotations/src/main/java/com/googlecode/androidannotations/annotations/ItemSelect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.METHOD)
public @interface ItemSelect {
int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";
}
4 changes: 3 additions & 1 deletion ...oidannotations/src/main/java/com/googlecode/androidannotations/annotations/LongClick.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.METHOD)
public @interface LongClick {
int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";
}
4 changes: 3 additions & 1 deletion ...dannotations/src/main/java/com/googlecode/androidannotations/annotations/OptionsItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
@Target(ElementType.METHOD)
public @interface OptionsItem {

int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";

}
4 changes: 3 additions & 1 deletion ...dannotations/src/main/java/com/googlecode/androidannotations/annotations/OptionsMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.TYPE)
public @interface OptionsMenu {
int value();
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
4 changes: 2 additions & 2 deletions ...de/androidannotations/annotations/Id.java → ...androidannotations/annotations/ResId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
*/
package com.googlecode.androidannotations.annotations;

public abstract class Id {
public abstract class ResId {

public static final int DEFAULT_VALUE = -1;

private Id() {
private ResId() {
}

}
4 changes: 3 additions & 1 deletion ...idannotations/src/main/java/com/googlecode/androidannotations/annotations/TextChange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@
@Target(ElementType.METHOD)
public @interface TextChange {

int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";

}
4 changes: 3 additions & 1 deletion ...androidannotations/src/main/java/com/googlecode/androidannotations/annotations/Touch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.METHOD)
public @interface Touch {
int[] value() default Id.DEFAULT_VALUE;
int[] value() default ResId.DEFAULT_VALUE;

String[] resName() default "";
}
4 changes: 3 additions & 1 deletion ...roidannotations/src/main/java/com/googlecode/androidannotations/annotations/ViewById.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface ViewById {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions ...tations/src/main/java/com/googlecode/androidannotations/annotations/res/AnimationRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

/**
* Use on fields in activity classes that should be injected with this specific
Expand All @@ -29,5 +29,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface AnimationRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions ...notations/src/main/java/com/googlecode/androidannotations/annotations/res/BooleanRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

/**
* Use on fields in activity classes that should be injected with this specific
Expand All @@ -29,5 +29,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface BooleanRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions ...annotations/src/main/java/com/googlecode/androidannotations/annotations/res/ColorRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

/**
* Use on fields in activity classes that should be injected with values from
Expand All @@ -35,5 +35,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface ColorRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions ...ns/src/main/java/com/googlecode/androidannotations/annotations/res/ColorStateListRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

/**
* Use on fields in activity classes that should be injected with this specific
Expand All @@ -29,5 +29,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface ColorStateListRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions .../main/java/com/googlecode/androidannotations/annotations/res/DimensionPixelOffsetRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

/**
* Use on fields in activity classes that should be injected with this specific
Expand All @@ -29,5 +29,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface DimensionPixelOffsetRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions ...rc/main/java/com/googlecode/androidannotations/annotations/res/DimensionPixelSizeRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

/**
* Use on fields in activity classes that should be injected with this specific
Expand All @@ -29,5 +29,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface DimensionPixelSizeRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions ...tations/src/main/java/com/googlecode/androidannotations/annotations/res/DimensionRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

/**
* Use on fields in activity classes that should be injected with this specific
Expand All @@ -29,5 +29,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface DimensionRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions ...otations/src/main/java/com/googlecode/androidannotations/annotations/res/DrawableRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

/**
* Use on fields in activity classes that should be injected with this specific
Expand All @@ -29,5 +29,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface DrawableRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions ...dannotations/src/main/java/com/googlecode/androidannotations/annotations/res/HtmlRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,12 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface HtmlRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
6 changes: 4 additions & 2 deletions ...otations/src/main/java/com/googlecode/androidannotations/annotations/res/IntArrayRes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

import com.googlecode.androidannotations.annotations.Id;
import com.googlecode.androidannotations.annotations.ResId;

/**
* Use on fields in activity classes that should be injected with this specific
Expand All @@ -29,5 +29,7 @@
@Retention(RetentionPolicy.SOURCE)
@Target(ElementType.FIELD)
public @interface IntArrayRes {
int value() default Id.DEFAULT_VALUE;
int value() default ResId.DEFAULT_VALUE;

String resName() default "";
}
Loading
X Tutup