Skip to content

Commit 661f658

Browse files
yDelouisyDelouis
committed
Rename putExtra and putArg methods in Builders
1 parent 89a21f7 commit 661f658

5 files changed

Lines changed: 67 additions & 64 deletions

File tree

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/FragmentBuilder.java‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -16,142 +16,142 @@ public FragmentBuilder() {
1616
args = new Bundle();
1717
}
1818

19-
public I putAll(Bundle map) {
19+
public I arg(Bundle map) {
2020
args.putAll(map);
2121
return (I) this;
2222
}
2323

24-
public I putBoolean(String key, boolean value) {
24+
public I arg(String key, boolean value) {
2525
args.putBoolean(key, value);
2626
return (I) this;
2727
}
2828

29-
public I putByte(String key, byte value) {
29+
public I arg(String key, byte value) {
3030
args.putByte(key, value);
3131
return (I) this;
3232
}
3333

34-
public I putChar(String key, char value) {
34+
public I arg(String key, char value) {
3535
args.putChar(key, value);
3636
return (I) this;
3737
}
3838

39-
public I putShort(String key, short value) {
39+
public I arg(String key, short value) {
4040
args.putShort(key, value);
4141
return (I) this;
4242
}
4343

44-
public I putInt(String key, int value) {
44+
public I arg(String key, int value) {
4545
args.putInt(key, value);
4646
return (I) this;
4747
}
4848

49-
public I putLong(String key, long value) {
49+
public I arg(String key, long value) {
5050
args.putLong(key, value);
5151
return (I) this;
5252
}
5353

54-
public I putFloat(String key, float value) {
54+
public I arg(String key, float value) {
5555
args.putFloat(key, value);
5656
return (I) this;
5757
}
5858

59-
public I putDouble(String key, double value) {
59+
public I arg(String key, double value) {
6060
args.putDouble(key, value);
6161
return (I) this;
6262
}
6363

64-
public I putString(String key, String value) {
64+
public I arg(String key, String value) {
6565
args.putString(key, value);
6666
return (I) this;
6767
}
6868

69-
public I putCharSequence(String key, CharSequence value) {
69+
public I arg(String key, CharSequence value) {
7070
args.putCharSequence(key, value);
7171
return (I) this;
7272
}
7373

74-
public I putParcelable(String key, Parcelable value) {
74+
public I arg(String key, Parcelable value) {
7575
args.putParcelable(key, value);
7676
return (I) this;
7777
}
7878

79-
public I putParcelableArray(String key, Parcelable[] value) {
79+
public I arg(String key, Parcelable[] value) {
8080
args.putParcelableArray(key, value);
8181
return (I) this;
8282
}
8383

84-
public I putParcelableArrayList(String key, ArrayList<? extends Parcelable> value) {
84+
public I parcelableArrayListArg(String key, ArrayList<? extends Parcelable> value) {
8585
args.putParcelableArrayList(key, value);
8686
return (I) this;
8787
}
8888

89-
public I putSparseParcelableArray(String key, SparseArray<? extends Parcelable> value) {
89+
public I arg(String key, SparseArray<? extends Parcelable> value) {
9090
args.putSparseParcelableArray(key, value);
9191
return (I) this;
9292
}
9393

94-
public I putIntegerArrayList(String key, ArrayList<Integer> value) {
94+
public I integerArrayListArg(String key, ArrayList<Integer> value) {
9595
args.putIntegerArrayList(key, value);
9696
return (I) this;
9797
}
9898

99-
public I putStringArrayList(String key, ArrayList<String> value) {
99+
public I stringArrayListArg(String key, ArrayList<String> value) {
100100
args.putStringArrayList(key, value);
101101
return (I) this;
102102
}
103103

104-
public I putSerializable(String key, Serializable value) {
104+
public I arg(String key, Serializable value) {
105105
args.putSerializable(key, value);
106106
return (I) this;
107107
}
108108

109-
public I putBooleanArray(String key, boolean[] value) {
109+
public I arg(String key, boolean[] value) {
110110
args.putBooleanArray(key, value);
111111
return (I) this;
112112
}
113113

114-
public I putByteArray(String key, byte[] value) {
114+
public I arg(String key, byte[] value) {
115115
args.putByteArray(key, value);
116116
return (I) this;
117117
}
118118

119-
public I putShortArray(String key, short[] value) {
119+
public I arg(String key, short[] value) {
120120
args.putShortArray(key, value);
121121
return (I) this;
122122
}
123123

124-
public I putCharArray(String key, char[] value) {
124+
public I arg(String key, char[] value) {
125125
args.putCharArray(key, value);
126126
return (I) this;
127127
}
128128

129-
public I putIntArray(String key, int[] value) {
129+
public I arg(String key, int[] value) {
130130
args.putIntArray(key, value);
131131
return (I) this;
132132
}
133133

134-
public I putLongArray(String key, long[] value) {
134+
public I arg(String key, long[] value) {
135135
args.putLongArray(key, value);
136136
return (I) this;
137137
}
138138

139-
public I putFloatArray(String key, float[] value) {
139+
public I arg(String key, float[] value) {
140140
args.putFloatArray(key, value);
141141
return (I) this;
142142
}
143143

144-
public I putDoubleArray(String key, double[] value) {
144+
public I arg(String key, double[] value) {
145145
args.putDoubleArray(key, value);
146146
return (I) this;
147147
}
148148

149-
public I putStringArray(String key, String[] value) {
149+
public I arg(String key, String[] value) {
150150
args.putStringArray(key, value);
151151
return (I) this;
152152
}
153153

154-
public I putBundle(String key, Bundle value) {
154+
public I arg(String key, Bundle value) {
155155
args.putBundle(key, value);
156156
return (I) this;
157157
}

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/api/builder/IntentBuilder.java‎

Lines changed: 27 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -42,142 +42,137 @@ public I action(String action) {
4242
return (I) this;
4343
}
4444

45-
public I extras(Bundle bundle) {
46-
intent.putExtras(bundle);
47-
return (I) this;
48-
}
49-
50-
public I putExtra(String name, boolean value) {
45+
public I extra(String name, boolean value) {
5146
intent.putExtra(name, value);
5247
return (I) this;
5348
}
5449

55-
public I putExtra(String name, byte value) {
50+
public I extra(String name, byte value) {
5651
intent.putExtra(name, value);
5752
return (I) this;
5853
}
5954

60-
public I putExtra(String name, char value) {
55+
public I extra(String name, char value) {
6156
intent.putExtra(name, value);
6257
return (I) this;
6358
}
6459

65-
public I putExtra(String name, short value) {
60+
public I extra(String name, short value) {
6661
intent.putExtra(name, value);
6762
return (I) this;
6863
}
6964

70-
public I putExtra(String name, int value) {
65+
public I extra(String name, int value) {
7166
intent.putExtra(name, value);
7267
return (I) this;
7368
}
7469

75-
public I putExtra(String name, long value) {
70+
public I extra(String name, long value) {
7671
intent.putExtra(name, value);
7772
return (I) this;
7873
}
7974

80-
public I putExtra(String name, float value) {
75+
public I extra(String name, float value) {
8176
intent.putExtra(name, value);
8277
return (I) this;
8378
}
8479

85-
public I putExtra(String name, double value) {
80+
public I extra(String name, double value) {
8681
intent.putExtra(name, value);
8782
return (I) this;
8883
}
8984

90-
public I putExtra(String name, String value) {
85+
public I extra(String name, String value) {
9186
intent.putExtra(name, value);
9287
return (I) this;
9388
}
9489

95-
public I putExtra(String name, CharSequence value) {
90+
public I extra(String name, CharSequence value) {
9691
intent.putExtra(name, value);
9792
return (I) this;
9893
}
9994

100-
public I putExtra(String name, Parcelable value) {
95+
public I extra(String name, Parcelable value) {
10196
intent.putExtra(name, value);
10297
return (I) this;
10398
}
10499

105-
public I putExtra(String name, Parcelable[] value) {
100+
public I extra(String name, Parcelable[] value) {
106101
intent.putExtra(name, value);
107102
return (I) this;
108103
}
109104

110-
public I putParcelableArrayListExtra(String name, ArrayList<? extends Parcelable> value) {
105+
public I parcelableArrayListExtra(String name, ArrayList<? extends Parcelable> value) {
111106
intent.putParcelableArrayListExtra(name, value);
112107
return (I) this;
113108
}
114109

115-
public I putIntegerArrayListExtra(String name, ArrayList<Integer> value) {
110+
public I integerArrayListExtra(String name, ArrayList<Integer> value) {
116111
intent.putIntegerArrayListExtra(name, value);
117112
return (I) this;
118113
}
119114

120-
public I putStringArrayListExtra(String name, ArrayList<String> value) {
115+
public I stringArrayListExtra(String name, ArrayList<String> value) {
121116
intent.putStringArrayListExtra(name, value);
122117
return (I) this;
123118
}
124119

125-
public I putExtra(String name, Serializable value) {
120+
public I extra(String name, Serializable value) {
126121
intent.putExtra(name, value);
127122
return (I) this;
128123
}
129124

130-
public I putExtra(String name, boolean[] value) {
125+
public I extra(String name, boolean[] value) {
131126
intent.putExtra(name, value);
132127
return (I) this;
133128
}
134129

135-
public I putExtra(String name, byte[] value) {
130+
public I extra(String name, byte[] value) {
136131
intent.putExtra(name, value);
137132
return (I) this;
138133
}
139134

140-
public I putExtra(String name, short[] value) {
135+
public I extra(String name, short[] value) {
141136
intent.putExtra(name, value);
142137
return (I) this;
143138
}
144139

145-
public I putExtra(String name, char[] value) {
140+
public I extra(String name, char[] value) {
146141
intent.putExtra(name, value);
147142
return (I) this;
148143
}
149144

150-
public I putExtra(String name, int[] value) {
145+
public I extra(String name, int[] value) {
151146
intent.putExtra(name, value);
152147
return (I) this;
153148
}
154149

155-
public I putExtra(String name, long[] value) {
150+
public I extra(String name, long[] value) {
156151
intent.putExtra(name, value);
157152
return (I) this;
158153
}
159154

160-
public I putExtra(String name, float[] value) {
155+
public I extra(String name, float[] value) {
161156
intent.putExtra(name, value);
162157
return (I) this;
163158
}
164159

165-
public I putExtra(String name, double[] value) {
160+
public I extra(String name, double[] value) {
166161
intent.putExtra(name, value);
167162
return (I) this;
168163
}
169164

170-
public I putExtra(String name, String[] value) {
165+
public I extra(String name, String[] value) {
171166
intent.putExtra(name, value);
172167
return (I) this;
173168
}
174169

175-
public I putExtra(String name, Bundle value) {
170+
public I extra(String name, Bundle value) {
176171
intent.putExtra(name, value);
177172
return (I) this;
178173
}
179174

180-
public I putExtras(Intent src) {
175+
public I extras(Intent src) {
181176
intent.putExtras(src);
182177
return (I) this;
183178
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/handler/FragmentArgHandler.java‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import javax.lang.model.element.Element;
3030
import javax.lang.model.type.TypeMirror;
3131

32-
import static com.sun.codemodel.JExpr._super;
32+
import static com.sun.codemodel.JExpr._this;
3333
import static com.sun.codemodel.JExpr.lit;
3434
import static com.sun.codemodel.JMod.*;
3535

@@ -101,11 +101,13 @@ private void injectArgInComponent(Element element, EFragmentHolder holder, Bundl
101101

102102
private void createBuilderInjectionMethod(Element element, EFragmentHolder holder, BundleHelper bundleHelper, JFieldVar argKeyStaticField, String fieldName) {
103103
JDefinedClass builderClass = holder.getBuilderClass();
104+
JFieldRef builderArgsField = holder.getBuilderArgsField();
104105
TypeMirror elementType = element.asType();
105106
JClass paramClass = codeModelHelper.typeMirrorToJClass(elementType, holder);
106107

107108
JMethod method = builderClass.method(PUBLIC, builderClass, fieldName);
108109
JVar arg = method.param(paramClass, fieldName);
109-
method.body()._return(_super().invoke(bundleHelper.getMethodNameToSave()).arg(argKeyStaticField).arg(arg));
110+
method.body().invoke(builderArgsField, bundleHelper.getMethodNameToSave()).arg(argKeyStaticField).arg(arg);
111+
method.body()._return(_this());
110112
}
111113
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/IntentBuilder.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ private JMethod addPutExtraMethod(TypeMirror elementType, String parameterName,
112112
JMethod method = holder.getIntentBuilderClass().method(PUBLIC, holder.getIntentBuilderClass(), parameterName);
113113
JClass parameterClass = codeModelHelper.typeMirrorToJClass(elementType, holder);
114114
JVar extraParameterVar = method.param(parameterClass, parameterName);
115-
JInvocation invocation = _super().invoke("putExtra").arg(extraKeyField);
115+
JInvocation invocation = _super().invoke("extra").arg(extraKeyField);
116116
if (castToSerializable) {
117117
invocation.arg(cast(holder.classes().SERIALIZABLE, extraParameterVar));
118118
} else if (castToParcelable) {

0 commit comments

Comments
 (0)