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

Commit 82392dc

Browse files
WonderCsaboWonderCsabo
committed
Drop ActionBarSherlock support
ActionBarSherlock is deprecated and no longer in development. Everybody should use AppCompat instead.
1 parent 92d2f8a commit 82392dc

24 files changed

Lines changed: 10 additions & 688 deletions

File tree

‎AndroidAnnotations/androidannotations-api/src/main/java/org/androidannotations/annotations/OptionsMenuItem.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
* activity classes to inject a menu item.
2727
* </p>
2828
* <p>
29-
* The field MUST be of type {@link android.view.MenuItem} or
30-
* com.actionbarsherlock.view.MenuItem.
29+
* The field MUST be of type {@link android.view.MenuItem}
3130
* </p>
3231
* <p>
3332
* The annotation value should be one or several of R.id.* fields. If not set,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void validate(Element element, AnnotationElements validatedElements, IsVa
7373

7474
validatorHelper.returnTypeIsVoidOrBoolean(executableElement, valid);
7575

76-
validatorHelper.param.anyOfTypes(CanonicalNameConstants.MENU_ITEM, CanonicalNameConstants.SHERLOCK_MENU_ITEM).optional().validate(executableElement, valid);
76+
validatorHelper.param.type(CanonicalNameConstants.MENU_ITEM).optional().validate(executableElement, valid);
7777
}
7878

7979
@Override

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

Lines changed: 0 additions & 58 deletions
This file was deleted.

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,6 @@ public final class CanonicalNameConstants {
128128
public static final String INTERNET_PERMISSION = "android.permission.INTERNET";
129129
public static final String WAKELOCK_PERMISSION = "android.permission.WAKE_LOCK";
130130

131-
/*
132-
* Sherlock
133-
*/
134-
public static final String SHERLOCK_MENU = "com.actionbarsherlock.view.Menu";
135-
public static final String SHERLOCK_MENU_ITEM = "com.actionbarsherlock.view.MenuItem";
136-
public static final String SHERLOCK_MENU_INFLATER = "com.actionbarsherlock.view.MenuInflater";
137-
138131
/*
139132
* SpringFramework
140133
*/

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,9 @@ public class ValidatorHelper {
124124

125125
public final ValidatorParameterHelper param;
126126

127-
private final ActionBarSherlockHelper thirdPartyLibHelper;
128-
129127
public ValidatorHelper(TargetAnnotationHelper targetAnnotationHelper) {
130128
annotationHelper = targetAnnotationHelper;
131129
param = new ValidatorParameterHelper(annotationHelper);
132-
thirdPartyLibHelper = new ActionBarSherlockHelper(annotationHelper);
133130
}
134131

135132
public void isNotFinal(Element element, IsValid valid) {
@@ -531,11 +528,7 @@ public void extendsMenuItem(Element element, IsValid valid) {
531528
TypeElement enclosingTypeElement = annotationHelper.typeElementFromQualifiedName(enclosingQualifiedName);
532529

533530
if (enclosingTypeElement != null) {
534-
if (thirdPartyLibHelper.usesActionBarSherlock(enclosingTypeElement)) {
535-
extendsType(element, CanonicalNameConstants.SHERLOCK_MENU_ITEM, valid);
536-
} else {
537-
extendsType(element, CanonicalNameConstants.MENU_ITEM, valid);
538-
}
531+
extendsType(element, CanonicalNameConstants.MENU_ITEM, valid);
539532
}
540533
}
541534

@@ -1533,6 +1526,7 @@ public void isPreferenceFragmentClassPresent(Element element, IsValid valid) {
15331526
annotationHelper.printAnnotationError(element, "The class " + CanonicalNameConstants.PREFERENCE_FRAGMENT + " cannot be found. You have to use at least API 11");
15341527
}
15351528
}
1529+
15361530
public void usesEnqueueIfHasId(Element element, IsValid valid) {
15371531
UiThread annotation = element.getAnnotation(UiThread.class);
15381532

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

Lines changed: 3 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
import javax.lang.model.util.ElementFilter;
3838

3939
import org.androidannotations.api.SdkVersionHelper;
40-
import org.androidannotations.helper.ActionBarSherlockHelper;
4140
import org.androidannotations.helper.ActivityIntentBuilder;
4241
import org.androidannotations.helper.AndroidManifest;
4342
import org.androidannotations.helper.AnnotationHelper;
@@ -247,44 +246,26 @@ protected void setOnContentChanged() {
247246
}
248247

249248
private void setOnCreateOptionsMenu() {
250-
JClass menuClass = classes().MENU;
251-
JClass menuInflaterClass = classes().MENU_INFLATER;
252-
String getMenuInflaterMethodName = "getMenuInflater";
253-
if (usesActionBarSherlock()) {
254-
menuClass = classes().SHERLOCK_MENU;
255-
menuInflaterClass = classes().SHERLOCK_MENU_INFLATER;
256-
getMenuInflaterMethodName = "getSupportMenuInflater";
257-
}
258-
259249
JMethod method = generatedClass.method(PUBLIC, codeModel().BOOLEAN, "onCreateOptionsMenu");
260250
method.annotate(Override.class);
261251
JBlock methodBody = method.body();
262-
onCreateOptionsMenuMenuParam = method.param(menuClass, "menu");
263-
onCreateOptionsMenuMenuInflaterVar = methodBody.decl(menuInflaterClass, "menuInflater", invoke(getMenuInflaterMethodName));
252+
onCreateOptionsMenuMenuParam = method.param(classes().MENU, "menu");
253+
onCreateOptionsMenuMenuInflaterVar = methodBody.decl(classes().MENU_INFLATER, "menuInflater", invoke("getMenuInflater"));
264254
onCreateOptionsMenuMethodBody = methodBody.block();
265255
methodBody._return(_super().invoke(method).arg(onCreateOptionsMenuMenuParam));
266256
}
267257

268258
private void setOnOptionsItemSelected() {
269-
JClass menuItemClass = classes().MENU_ITEM;
270-
if (usesActionBarSherlock()) {
271-
menuItemClass = classes().SHERLOCK_MENU_ITEM;
272-
}
273-
274259
JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onOptionsItemSelected");
275260
method.annotate(Override.class);
276261
JBlock methodBody = method.body();
277-
onOptionsItemSelectedItem = method.param(menuItemClass, "item");
262+
onOptionsItemSelectedItem = method.param(classes().MENU_ITEM, "item");
278263
onOptionsItemSelectedItemId = methodBody.decl(codeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
279264
onOptionsItemSelectedMiddleBlock = methodBody.block();
280265

281266
methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
282267
}
283268

284-
private boolean usesActionBarSherlock() {
285-
return new ActionBarSherlockHelper(new AnnotationHelper(processingEnvironment())).usesActionBarSherlock(this);
286-
}
287-
288269
@Override
289270
protected void setFindNativeFragmentById() {
290271
JMethod method = generatedClass.method(PRIVATE, classes().FRAGMENT, "findNativeFragmentById");

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

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333

3434
import org.androidannotations.annotations.EFragment;
3535
import org.androidannotations.annotations.Receiver.RegisterAt;
36-
import org.androidannotations.helper.ActionBarSherlockHelper;
37-
import org.androidannotations.helper.AnnotationHelper;
3836
import org.androidannotations.helper.OrmLiteHelper;
3937
import org.androidannotations.holder.ReceiverRegistrationHolder.IntentFilterData;
4038
import org.androidannotations.process.ProcessHolder;
@@ -183,44 +181,28 @@ private void generify(JGenerifiable generifiable) {
183181
}
184182

185183
private void setOnCreateOptionsMenu() {
186-
JClass menuClass = classes().MENU;
187-
JClass menuInflaterClass = classes().MENU_INFLATER;
188-
if (usesActionBarSherlock()) {
189-
menuClass = classes().SHERLOCK_MENU;
190-
menuInflaterClass = classes().SHERLOCK_MENU_INFLATER;
191-
}
192-
193184
JMethod method = generatedClass.method(PUBLIC, codeModel().VOID, "onCreateOptionsMenu");
194185
method.annotate(Override.class);
195186
JBlock methodBody = method.body();
196-
onCreateOptionsMenuMenuParam = method.param(menuClass, "menu");
197-
onCreateOptionsMenuMenuInflaterVar = method.param(menuInflaterClass, "inflater");
187+
onCreateOptionsMenuMenuParam = method.param(classes().MENU, "menu");
188+
onCreateOptionsMenuMenuInflaterVar = method.param(classes().MENU_INFLATER, "inflater");
198189
onCreateOptionsMenuMethodBody = methodBody.block();
199190
methodBody.invoke(_super(), method).arg(onCreateOptionsMenuMenuParam).arg(onCreateOptionsMenuMenuInflaterVar);
200191

201192
getInitBody().invoke("setHasOptionsMenu").arg(JExpr.TRUE);
202193
}
203194

204195
private void setOnOptionsItemSelected() {
205-
JClass menuItemClass = classes().MENU_ITEM;
206-
if (usesActionBarSherlock()) {
207-
menuItemClass = classes().SHERLOCK_MENU_ITEM;
208-
}
209-
210196
JMethod method = generatedClass.method(JMod.PUBLIC, codeModel().BOOLEAN, "onOptionsItemSelected");
211197
method.annotate(Override.class);
212198
JBlock methodBody = method.body();
213-
onOptionsItemSelectedItem = method.param(menuItemClass, "item");
199+
onOptionsItemSelectedItem = method.param(classes().MENU_ITEM, "item");
214200
onOptionsItemSelectedItemId = methodBody.decl(codeModel().INT, "itemId_", onOptionsItemSelectedItem.invoke("getItemId"));
215201
onOptionsItemSelectedMiddleBlock = methodBody.block();
216202

217203
methodBody._return(invoke(_super(), method).arg(onOptionsItemSelectedItem));
218204
}
219205

220-
private boolean usesActionBarSherlock() {
221-
return new ActionBarSherlockHelper(new AnnotationHelper(processingEnvironment())).usesActionBarSherlock(this);
222-
}
223-
224206
@Override
225207
protected void setContextRef() {
226208
contextRef = JExpr.invoke("getActivity");

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/process/ProcessHolder.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,6 @@ public class Classes {
129129
public final JClass PREFERENCE_CLICK_LISTENER = refClass(CanonicalNameConstants.PREFERENCE_CLICK_LISTENER);
130130
public final JClass PREFERENCE_ACTIVITY_HEADER = refClass(CanonicalNameConstants.PREFERENCE_ACTIVITY_HEADER);
131131

132-
/*
133-
* Sherlock
134-
*/
135-
public final JClass SHERLOCK_MENU = refClass(CanonicalNameConstants.SHERLOCK_MENU);
136-
public final JClass SHERLOCK_MENU_ITEM = refClass(CanonicalNameConstants.SHERLOCK_MENU_ITEM);
137-
public final JClass SHERLOCK_MENU_INFLATER = refClass(CanonicalNameConstants.SHERLOCK_MENU_INFLATER);
138-
139132
/*
140133
* RoboGuice
141134
*/

‎AndroidAnnotations/androidannotations/src/test/java/com/actionbarsherlock/app/SherlockActivity.java‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎AndroidAnnotations/androidannotations/src/test/java/com/actionbarsherlock/view/MenuItem.java‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)