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

Fix @ItemClick and parametrized types #627

Merged
DayS merged 2 commits into from
Jun 18, 2013
Merged

Fix @ItemClick and parametrized types #627

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa593ba
Fix wrong generated code
yDelouis Jun 12, 2013
aee786f
Add functional test
yDelouis Jun 17, 2013
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
Next Next commit
Fix wrong generated code
  • Loading branch information
@yDelouis
yDelouis committed Jun 12, 2013
commit aa593ba392c6d2f3c0f7e91bc2268cef84be08e2
10 changes: 8 additions & 2 deletions ...ndroidannotations/src/main/java/org/androidannotations/processing/ItemClickProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import javax.lang.model.type.TypeMirror;

import org.androidannotations.annotations.ItemClick;
import org.androidannotations.helper.APTCodeModelHelper;
import org.androidannotations.helper.IdAnnotationHelper;
import org.androidannotations.processing.EBeansHolder.Classes;
import org.androidannotations.rclass.IRClass;
Expand All @@ -48,6 +49,7 @@
public class ItemClickProcessor implements DecoratingElementProcessor {

private IdAnnotationHelper helper;
private final APTCodeModelHelper codeModelHelper = new APTCodeModelHelper();

public ItemClickProcessor(ProcessingEnvironment processingEnv, IRClass rClass) {
helper = new IdAnnotationHelper(processingEnv, getTarget(), rClass);
Expand Down Expand Up @@ -90,8 +92,12 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
if (parameterType.getKind() == TypeKind.INT) {
itemClickCall.arg(onItemClickPositionParam);
} else {
String parameterTypeQualifiedName = parameterType.toString();
itemClickCall.arg(cast(holder.refClass(parameterTypeQualifiedName), invoke(onItemClickParentParam, "getAdapter").invoke("getItem").arg(onItemClickPositionParam)));
JClass parameterClass = codeModelHelper.typeMirrorToJClass(parameterType, holder);
itemClickCall.arg(cast(parameterClass, invoke(onItemClickParentParam, "getAdapter").invoke("getItem").arg(onItemClickPositionParam)));

if (parameterClass.isParameterized()) {
onItemClickMethod.annotate(SuppressWarnings.class).param("value", "unchecked");
}
}
}

Expand Down
6 changes: 6 additions & 0 deletions AndroidAnnotations/functional-test-1-5/res/layout/item_clicks_handled.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>

<ListView
android:id="@+id/listViewWithArgumentWithParameterType"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>

<ListView
android:id="@+id/listViewWithPosition"
Expand Down
32 changes: 22 additions & 10 deletions ...ional-test-1-5/src/main/java/org/androidannotations/test15/ItemClicksHandledActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
*/
package org.androidannotations.test15;

import android.app.Activity;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Spinner;
import java.util.ArrayList;

import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
Expand All @@ -27,6 +24,11 @@
import org.androidannotations.annotations.ItemSelect;
import org.androidannotations.annotations.ViewById;

import android.app.Activity;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Spinner;

@EActivity(R.layout.item_clicks_handled)
public class ItemClicksHandledActivity extends Activity {

Expand All @@ -39,12 +41,15 @@ public class ItemClicksHandledActivity extends Activity {
@ViewById
ListView listViewWithArgument;

@ViewById
ListView listViewWithArgumentWithParameterType;

@ViewById
Spinner spinnerWithArgument;

@ViewById
ListView listViewWithPosition;

@ViewById
ListView listViewWithOneParam;

Expand All @@ -65,13 +70,15 @@ public class ItemClicksHandledActivity extends Activity {

@AfterViews
void initView() {
adapter = ArrayAdapter.createFromResource(this, R.array.planets_array, R.layout.simple_spinner_item);
adapter = ArrayAdapter.createFromResource(this, R.array.planets_array,
R.layout.simple_spinner_item);
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);

spinner.setAdapter(adapter);
listView.setAdapter(adapter);
spinnerWithArgument.setAdapter(adapter);
listViewWithArgument.setAdapter(adapter);
listViewWithArgumentWithParameterType.setAdapter(adapter);
listViewWithPosition.setAdapter(adapter);
listViewWithOneParam.setAdapter(adapter);
spinnerItemClicked = false;
Expand All @@ -92,6 +99,11 @@ public void listViewWithArgument(String selectedItem) {
listViewWithArgumentSelectedItem = selectedItem;
}

@ItemClick(R.id.listViewWithArgumentWithParameterType)
protected void listViewWithArgumentWithParameterType(ArrayList<String> item) {

}

@ItemClick
public void spinner() {
spinnerItemClicked = true;
Expand All @@ -101,23 +113,23 @@ public void spinner() {
public void spinnerWithArgument(String selectedItem) {
spinnerWithArgumentSelectedItem = selectedItem;
}

@ItemClick
void listViewWithPosition(int position) {
listViewWithPositionClickedPosition = position;
}

@ItemSelect
void listViewWithPositionItemSelected(boolean selected, int position) {
listViewWithPositionItemSelected = selected;
listViewWithPositionItemSelectedPosition = position;
}

@ItemSelect
void listViewWithOneParamItemSelected(boolean selected) {
listViewWithOneParamItemSelected = selected;
}

@ItemLongClick
void listViewWithPositionItemLongClicked(int position) {

Expand Down