Tweaks.

nxbdi · Sep 6, 2012 · b16426d · b16426d
1 parent 2ae777e
commit b16426d
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 63 deletions.
diff --git a/base/src/org/droidparts/persist/sql/EntityManager.java b/base/src/org/droidparts/persist/sql/EntityManager.java
@@ -221,7 +221,7 @@ protected void putToContentValues(ContentValues cv, String key,
 		} else if (isArray(valueCls) || isCollection(valueCls)) {
 			Object[] arr;
 			if (isArray(valueCls)) {
-				arr = toObjectArr(valueCls, value);
+				arr = toObjectArr(value);
 			} else {
 				Collection<?> coll = (Collection<?>) value;
 				arr = coll.toArray(new Object[coll.size()]);

diff --git a/base/src/org/droidparts/reflect/util/ReflectionUtils.java b/base/src/org/droidparts/reflect/util/ReflectionUtils.java
@@ -122,32 +122,25 @@ public static List<Field> listAnnotatedFields(Class<?> cls) {
 	}
 
 	public static Class<?> getArrayType(Class<?> arrCls) {
-		String clsName = arrCls.getName();
-		if (clsName.length() == 2) {
-			// primitives - [Z
-			clsName = clsName.substring(1);
-			if ("B".equals(clsName)) {
-				return byte.class;
-			} else if ("S".equals(clsName)) {
-				return short.class;
-			} else if ("I".equals(clsName)) {
-				return int.class;
-			} else if ("J".equals(clsName)) {
-				return long.class;
-			} else if ("F".equals(clsName)) {
-				return float.class;
-			} else if ("D".equals(clsName)) {
-				return double.class;
-			} else if ("Z".equals(clsName)) {
-				return boolean.class;
-			} else if ("C".equals(clsName)) {
-				return char.class;
-			} else {
-				throw new IllegalArgumentException("Alien primitive: "
-						+ clsName);
-			}
+		if (arrCls == byte[].class) {
+			return byte.class;
+		} else if (arrCls == short[].class) {
+			return short.class;
+		} else if (arrCls == int[].class) {
+			return int.class;
+		} else if (arrCls == long[].class) {
+			return long.class;
+		} else if (arrCls == float[].class) {
+			return float.class;
+		} else if (arrCls == double[].class) {
+			return double.class;
+		} else if (arrCls == boolean[].class) {
+			return boolean.class;
+		} else if (arrCls == char[].class) {
+			return char.class;
 		} else {
 			// objects - [Ljava.lang.String;
+			String clsName = arrCls.getName();
 			clsName = clsName.substring(2, clsName.length() - 1);
 			return classForName(clsName);
 		}
@@ -177,7 +170,7 @@ public static Object[] varArgsHack(Object[] varArgs) {
 			if (firstArg != null) {
 				Class<?> firstArgCls = firstArg.getClass();
 				if (isArray(firstArgCls)) {
-					varArgs = toObjectArr(getArrayType(firstArgCls), firstArg);
+					varArgs = toObjectArr(firstArg);
 				}
 			}
 		}

diff --git a/base/src/org/droidparts/reflect/util/TypeHelper.java b/base/src/org/droidparts/reflect/util/TypeHelper.java
@@ -121,25 +121,25 @@ public static boolean isEntity(Class<?> cls) {
 
 	//
 
-	public static Object[] toObjectArr(Class<?> arrOrArgCls, Object someArr) {
+	public static Object[] toObjectArr(Object someArr) {
 		// as autoboxing won't work for Arrays.asList(int[] value)
+		Class<?> arrCls = someArr.getClass();
 		Object[] arr;
-		if (arrOrArgCls == byte.class || arrOrArgCls == byte[].class) {
+		if (arrCls == byte[].class) {
 			arr = toObject((byte[]) someArr);
-		} else if (arrOrArgCls == short.class || arrOrArgCls == short[].class) {
+		} else if (arrCls == short[].class) {
 			arr = toObject((short[]) someArr);
-		} else if (arrOrArgCls == int.class || arrOrArgCls == int[].class) {
+		} else if (arrCls == int[].class) {
 			arr = toObject((int[]) someArr);
-		} else if (arrOrArgCls == long.class || arrOrArgCls == long[].class) {
+		} else if (arrCls == long[].class) {
 			arr = toObject((long[]) someArr);
-		} else if (arrOrArgCls == float.class || arrOrArgCls == float[].class) {
+		} else if (arrCls == float[].class) {
 			arr = toObject((float[]) someArr);
-		} else if (arrOrArgCls == double.class || arrOrArgCls == double[].class) {
+		} else if (arrCls == double[].class) {
 			arr = toObject((double[]) someArr);
-		} else if (arrOrArgCls == boolean.class
-				|| arrOrArgCls == boolean[].class) {
+		} else if (arrCls == boolean[].class) {
 			arr = toObject((boolean[]) someArr);
-		} else if (arrOrArgCls == char.class || arrOrArgCls == char[].class) {
+		} else if (arrCls == char[].class) {
 			arr = toObject((char[]) someArr);
 		} else {
 			// out of primitives

diff --git a/base/src/org/droidparts/task/AsyncTask.java b/base/src/org/droidparts/task/AsyncTask.java
@@ -94,8 +94,4 @@ protected void onFailurePostExecute(Exception exception) {
 		}
 	}
 
-	public Context getContext() {
-		return ctx;
-	}
-
 }
diff --git a/extra/src/org/droidparts/adapter/spinner/SpinnerAdapter.java b/extra/src/org/droidparts/adapter/spinner/SpinnerAdapter.java
@@ -29,7 +29,7 @@ public SpinnerAdapter(Spinner spinner, List<T> list) {
 		this(spinner, android.R.layout.simple_spinner_item, list);
 	}
 
-	protected SpinnerAdapter(Spinner spinner, int rowResId, List<T> list) {
+	public SpinnerAdapter(Spinner spinner, int rowResId, List<T> list) {
 		super(spinner.getContext(), rowResId, list);
 		setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
 		this.spinner = spinner;

diff --git a/extra/src/org/droidparts/adapter/spinner/StringSpinnerAdapter.java b/extra/src/org/droidparts/adapter/spinner/StringSpinnerAdapter.java
@@ -21,11 +21,11 @@
 
 public class StringSpinnerAdapter extends SpinnerAdapter<String> {
 
-	protected StringSpinnerAdapter(Spinner spinner, int stringArrResId) {
+	public StringSpinnerAdapter(Spinner spinner, int stringArrResId) {
 		this(spinner, getArr(spinner, stringArrResId));
 	}
 
-	protected StringSpinnerAdapter(Spinner spinner, String[] arr) {
+	public StringSpinnerAdapter(Spinner spinner, String[] arr) {
 		super(spinner, Arrays.asList(arr));
 	}
 

diff --git a/extra/src/org/droidparts/backup/DbBackupHelper.java b/extra/src/org/droidparts/backup/DbBackupHelper.java
diff --git a/extra/src/org/droidparts/util/io/IOUtils.java b/extra/src/org/droidparts/util/io/IOUtils.java
@@ -44,12 +44,10 @@ public static String urlEncode(String str) {
 
 	public static void silentlyClose(Closeable... closeables) {
 		for (Closeable cl : closeables) {
-			if (cl != null) {
-				try {
-					cl.close();
-				} catch (Exception e) {
-					L.d(e);
-				}
+			try {
+				cl.close();
+			} catch (Exception e) {
+				L.d(e);
 			}
 		}
 	}

diff --git a/extra/src/org/droidparts/util/ui/ViewUtils.java b/extra/src/org/droidparts/util/ui/ViewUtils.java
@@ -65,7 +65,7 @@ public void onAnimationEnd(Animation animation) {
 		upperViewTo.startAnimation(animTo);
 	}
 
-	public static void showKeyboardDelayed(final View view) {
+	public static void showKeyboard(final View view) {
 		new Handler(Looper.getMainLooper()).postDelayed(new Runnable() {
 
 			@Override

diff --git a/modern/src/org/droidparts/loader/AsyncTaskLoaderAdapter.java b/modern/src/org/droidparts/loader/AsyncTaskLoaderAdapter.java
@@ -18,12 +18,14 @@
 import org.droidparts.task.AsyncTask;
 import org.droidparts.util.L;
 
+import android.content.Context;
+
 public class AsyncTaskLoaderAdapter<Result> extends AsyncTaskLoader<Result> {
 
 	private final AsyncTask<?, ?, Result> task;
 
-	public AsyncTaskLoaderAdapter(AsyncTask<?, ?, Result> task) {
-		super(task.getContext());
+	public AsyncTaskLoaderAdapter(Context ctx, AsyncTask<?, ?, Result> task) {
+		super(ctx);
 		this.task = task;
 	}