Skip to content

Commit ccc9aff

Browse files
WonderCsaboWonderCsabo
committed
Introduce new GeneratedClassHolderDecorator
This contains code for a holder which is delegating the common methods to the decorated holder.
1 parent 5512d74 commit ccc9aff

3 files changed

Lines changed: 58 additions & 94 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/GeneratedClassHolderDecorator.java‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
package org.androidannotations.holder;
2+
3+
import javax.annotation.processing.ProcessingEnvironment;
4+
import javax.lang.model.element.TypeElement;
5+
6+
import org.androidannotations.process.ProcessHolder.Classes;
7+
8+
import com.sun.codemodel.JClass;
9+
import com.sun.codemodel.JCodeModel;
10+
import com.sun.codemodel.JDefinedClass;
11+
12+
public class GeneratedClassHolderDecorator<T extends GeneratedClassHolder> extends GeneratedClassHolderWrapper<T> implements GeneratedClassHolder {
13+
14+
public GeneratedClassHolderDecorator(T holder) {
15+
super(holder);
16+
}
17+
18+
@Override
19+
public final JDefinedClass getGeneratedClass() {
20+
return holder.getGeneratedClass();
21+
}
22+
23+
@Override
24+
public final TypeElement getAnnotatedElement() {
25+
return holder.getAnnotatedElement();
26+
}
27+
28+
@Override
29+
public final ProcessingEnvironment processingEnvironment() {
30+
return holder.processingEnvironment();
31+
}
32+
33+
@Override
34+
public final Classes classes() {
35+
return holder.classes();
36+
}
37+
38+
@Override
39+
public final JCodeModel codeModel() {
40+
return holder.codeModel();
41+
}
42+
43+
@Override
44+
public final JClass refClass(String fullyQualifiedClassName) {
45+
return holder.refClass(fullyQualifiedClassName);
46+
}
47+
48+
@Override
49+
public final JClass refClass(Class<?> clazz) {
50+
return holder.refClass(clazz);
51+
}
52+
53+
@Override
54+
public final JDefinedClass definedClass(String fullyQualifiedClassName) {
55+
return holder.definedClass(fullyQualifiedClassName);
56+
}
57+
58+
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/InstanceStateHolder.java‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,7 @@
2121
import static com.sun.codemodel.JMod.PUBLIC;
2222
import static org.androidannotations.helper.ModelConstants.generationSuffix;
2323

24-
import javax.annotation.processing.ProcessingEnvironment;
25-
import javax.lang.model.element.TypeElement;
26-
27-
import org.androidannotations.process.ProcessHolder;
28-
2924
import com.sun.codemodel.JBlock;
30-
import com.sun.codemodel.JClass;
31-
import com.sun.codemodel.JCodeModel;
32-
import com.sun.codemodel.JDefinedClass;
3325
import com.sun.codemodel.JExpr;
3426
import com.sun.codemodel.JMethod;
3527
import com.sun.codemodel.JVar;
@@ -100,44 +92,4 @@ private void setRestoreStateMethod() {
10092
public JMethod getInit() {
10193
return holder.getInit();
10294
}
103-
104-
@Override
105-
public JDefinedClass getGeneratedClass() {
106-
return holder.getGeneratedClass();
107-
}
108-
109-
@Override
110-
public JCodeModel codeModel() {
111-
return holder.codeModel();
112-
}
113-
114-
@Override
115-
public ProcessHolder.Classes classes() {
116-
return holder.classes();
117-
}
118-
119-
@Override
120-
public TypeElement getAnnotatedElement() {
121-
return holder.getAnnotatedElement();
122-
}
123-
124-
@Override
125-
public ProcessingEnvironment processingEnvironment() {
126-
return holder.processingEnvironment();
127-
}
128-
129-
@Override
130-
public JClass refClass(String fullyQualifiedClassName) {
131-
return holder.refClass(fullyQualifiedClassName);
132-
}
133-
134-
@Override
135-
public JClass refClass(Class<?> clazz) {
136-
return holder.refClass(clazz);
137-
}
138-
139-
@Override
140-
public JDefinedClass definedClass(String fullyQualifiedClassName) {
141-
return holder.definedClass(fullyQualifiedClassName);
142-
}
14395
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/holder/PreferencesHolder.java‎

Lines changed: 0 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,10 @@
2020
import static com.sun.codemodel.JExpr.invoke;
2121
import static com.sun.codemodel.JMod.PUBLIC;
2222

23-
import javax.annotation.processing.ProcessingEnvironment;
24-
import javax.lang.model.element.TypeElement;
25-
2623
import org.androidannotations.helper.APTCodeModelHelper;
27-
import org.androidannotations.process.ProcessHolder.Classes;
2824

2925
import com.sun.codemodel.JBlock;
3026
import com.sun.codemodel.JClass;
31-
import com.sun.codemodel.JCodeModel;
32-
import com.sun.codemodel.JDefinedClass;
3327
import com.sun.codemodel.JExpr;
3428
import com.sun.codemodel.JExpression;
3529
import com.sun.codemodel.JFieldRef;
@@ -47,46 +41,6 @@ public PreferencesHolder(EComponentWithViewSupportHolder holder) {
4741
super(holder);
4842
}
4943

50-
@Override
51-
public JDefinedClass getGeneratedClass() {
52-
return holder.getGeneratedClass();
53-
}
54-
55-
@Override
56-
public TypeElement getAnnotatedElement() {
57-
return holder.getAnnotatedElement();
58-
}
59-
60-
@Override
61-
public ProcessingEnvironment processingEnvironment() {
62-
return holder.processingEnvironment();
63-
}
64-
65-
@Override
66-
public Classes classes() {
67-
return holder.classes();
68-
}
69-
70-
@Override
71-
public JCodeModel codeModel() {
72-
return holder.codeModel();
73-
}
74-
75-
@Override
76-
public JClass refClass(String fullyQualifiedClassName) {
77-
return holder.refClass(fullyQualifiedClassName);
78-
}
79-
80-
@Override
81-
public JClass refClass(Class<?> clazz) {
82-
return refClass(clazz);
83-
}
84-
85-
@Override
86-
public JDefinedClass definedClass(String fullyQualifiedClassName) {
87-
return definedClass(fullyQualifiedClassName);
88-
}
89-
9044
@Override
9145
public JBlock getAddPreferencesFromResourceBlock() {
9246
if (addPreferencesFromResourceBlock == null) {

0 commit comments

Comments
 (0)