Skip to content
Open
Changes from all commits
Commits
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
42 changes: 37 additions & 5 deletions src/com/activeandroid/Model.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@SuppressWarnings("unchecked")
public abstract class Model {
Expand All @@ -46,6 +48,9 @@ public abstract class Model {

private final TableInfo mTableInfo;
private final String idName;
private static Map<String, List<Integer>> columnIndexesCache = new HashMap<String, List<Integer>>();
private static Map<String, List<Class>> fieldTypesCache = new HashMap<String, List<Class>>();

//////////////////////////////////////////////////////////////////////////////////////
// CONSTRUCTORS
//////////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -79,7 +84,9 @@ public final Long save() {
final String fieldName = mTableInfo.getColumnName(field);
Class<?> fieldType = field.getType();

field.setAccessible(true);
if (!field.isAccessible()) {
field.setAccessible(true);
}

try {
Object value = field.get(this);
Expand Down Expand Up @@ -183,16 +190,39 @@ public final void loadFromCursor(Cursor cursor) {
* when the cursor have multiple columns with same name obtained from join tables.
*/
List<String> columnsOrdered = new ArrayList<String>(Arrays.asList(cursor.getColumnNames()));
List<Integer> columnIndexes = columnIndexesCache.get(mTableInfo.getTableName());
if (columnIndexes == null) {
columnIndexes = new ArrayList<Integer>();
columnIndexesCache.put(mTableInfo.getTableName(), columnIndexes);
}
List<Class> fieldTypes = fieldTypesCache.get(mTableInfo.getTableName());
if (fieldTypes == null) {
fieldTypes = new ArrayList<Class>();
fieldTypesCache.put(mTableInfo.getTableName(), fieldTypes);
}
int counter = 0;
for (Field field : mTableInfo.getFields()) {
final String fieldName = mTableInfo.getColumnName(field);
Class<?> fieldType = field.getType();
final int columnIndex = columnsOrdered.indexOf(fieldName);
final int columnIndex;
Class<?> fieldType;
if (columnIndexes.size() <= counter) {
String fieldName = mTableInfo.getColumnName(field);
columnIndex = columnsOrdered.indexOf(fieldName);
columnIndexes.add(columnIndex);

fieldType = field.getType();
fieldTypes.add(fieldType);
} else {
columnIndex = columnIndexes.get(counter);
fieldType = fieldTypes.get(counter);
}

if (columnIndex < 0) {
continue;
}

field.setAccessible(true);
if (!field.isAccessible()) {
field.setAccessible(true);
}

try {
boolean columnIsNull = cursor.isNull(columnIndex);
Expand Down Expand Up @@ -264,6 +294,8 @@ else if (ReflectionUtils.isSubclassOf(fieldType, Enum.class)) {
if (value != null) {
field.set(this, value);
}

counter++;
}
catch (IllegalArgumentException e) {
Log.e(e.getClass().getName(), e);
Expand Down