Merge branch 'develop'

CHANGES

@@ -1,3 +1,7 @@
+1.1.0 /2013-02-18/:
+    * base, extra & fragments got merged into a single library. Thank ADT bug.
+    * Misc fixes & tweaks.
+
 1.0.8 /2013-02-01/:
     * Changed EntityManager to fill eager foreign keys.
     * BitmapUtils: a couple of new methods.

sample/DroidPartsGram/AndroidManifest.xml → droidparts-samples/DroidPartsGram/AndroidManifest.xml

@@ -4,8 +4,8 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="15" />
+        android:minSdkVersion="8"
+        android:targetSdkVersion="14" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />

droidparts-samples/DroidPartsGram/project.properties

@@ -0,0 +1,7 @@
+# Project target.
+target=android-14
+
+android.library.reference.1=../../droidparts
+android.library.reference.2=../../../ActionBarSherlock/library
+
+proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:../../proguard-droidparts.cfg

sample/droidparts-sample/AndroidManifest.xml → droidparts-samples/droidparts-sample/AndroidManifest.xml

@@ -4,7 +4,7 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="10"/>
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="14"/>
 
     <application
         android:icon="@drawable/ic_launcher"

sample/droidparts-sample/project.properties → droidparts-samples/droidparts-sample/project.properties

@@ -1,6 +1,5 @@
-target=android-7
+target=android-14
 
-android.library.reference.1=../../base
-android.library.reference.2=../../extra
+android.library.reference.1=../../droidparts
 
 proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:../../proguard-droidparts.cfg

droidparts-test/project.properties

@@ -0,0 +1,4 @@
+# Project target.
+target=android-14
+
+android.library.reference.1=../droidparts

base/.project → droidparts/.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>droidparts-base</name>
+	<name>droidparts</name>
 	<comment></comment>
 	<projects>
 	</projects>

extra/AndroidManifest.xml → droidparts/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="org.droidparts" >
-    <uses-sdk android:minSdkVersion="7" />
+    <uses-sdk android:minSdkVersion="8" />
 </manifest>

droidparts/pom.xml

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.droidparts</groupId>
+		<artifactId>droidparts-parent</artifactId>
+		<version>1.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>droidparts</artifactId>
+	<name>DroidParts</name>
+	<packaging>apklib</packaging>
+
+	<dependencies>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>android</artifactId>
+			<version>4.0_r3</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.google.android</groupId>
+			<artifactId>support-v4</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.actionbarsherlock</groupId>
+			<artifactId>actionbarsherlock</artifactId>
+			<version>4.2.0</version>
+			<type>apklib</type>
+		</dependency>
+	</dependencies>
+
+	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+					<compilerArgument>-proc:none</compilerArgument>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
+				<artifactId>android-maven-plugin</artifactId>
+				<inherited>true</inherited>
+				<extensions>true</extensions>
+				<configuration>
+					<!--<sign> -->
+					<!--<debug>false</debug> -->
+					<!--</sign> -->
+					<!--<proguard> -->
+					<!--<config>proguard-droidparts.cfg</config> -->
+					<!--<skip>false</skip> -->
+					<!--</proguard> -->
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>

droidparts/project.properties

@@ -0,0 +1,5 @@
+android.library=true
+
+target=android-14
+
+android.library.reference.1=../../ActionBarSherlock/library

fragments/src/org/droidparts/activity/sherlock/FragmentActivity.java → droidparts/src/org/droidparts/activity/sherlock/FragmentActivity.java

@@ -17,7 +17,7 @@
 
 import org.droidparts.inject.Injectable;
 import org.droidparts.inject.Injector;
-import org.droidparts.util.SecretFragmentsSupportUtil;
+import org.droidparts.util.fragments.SecretFragmentsSupportUtil;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;

fragments/src/org/droidparts/activity/sherlock/SingleFragmentActivity.java → droidparts/src/org/droidparts/activity/sherlock/SingleFragmentActivity.java

@@ -15,7 +15,7 @@
  */
 package org.droidparts.activity.sherlock;
 
-import org.droidparts.util.SecretFragmentsSupportUtil;
+import org.droidparts.util.fragments.SecretFragmentsSupportUtil;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;

fragments/src/org/droidparts/activity/stock/FragmentActivity.java → droidparts/src/org/droidparts/activity/stock/FragmentActivity.java

@@ -17,7 +17,7 @@
 
 import org.droidparts.inject.Injectable;
 import org.droidparts.inject.Injector;
-import org.droidparts.util.SecretFragmentsStockUtil;
+import org.droidparts.util.fragments.SecretFragmentsStockUtil;
 
 import android.app.Fragment;
 import android.os.Bundle;

fragments/src/org/droidparts/activity/stock/SingleFragmentActivity.java → droidparts/src/org/droidparts/activity/stock/SingleFragmentActivity.java

@@ -15,7 +15,7 @@
  */
 package org.droidparts.activity.stock;
 
-import org.droidparts.util.SecretFragmentsStockUtil;
+import org.droidparts.util.fragments.SecretFragmentsStockUtil;
 
 import android.app.Fragment;
 import android.os.Bundle;

fragments/src/org/droidparts/activity/support/FragmentActivity.java → droidparts/src/org/droidparts/activity/support/FragmentActivity.java

@@ -17,7 +17,7 @@
 
 import org.droidparts.inject.Injectable;
 import org.droidparts.inject.Injector;
-import org.droidparts.util.SecretFragmentsSupportUtil;
+import org.droidparts.util.fragments.SecretFragmentsSupportUtil;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;

fragments/src/org/droidparts/activity/support/SingleFragmentActivity.java → droidparts/src/org/droidparts/activity/support/SingleFragmentActivity.java

@@ -15,7 +15,7 @@
  */
 package org.droidparts.activity.support;
 
-import org.droidparts.util.SecretFragmentsSupportUtil;
+import org.droidparts.util.fragments.SecretFragmentsSupportUtil;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;

base/src/org/droidparts/adapter/cursor/CursorAdapter.java → droidparts/src/org/droidparts/adapter/cursor/CursorAdapter.java

@@ -39,4 +39,11 @@ public Context getContext() {
 		return ctx;
 	}
 
+	public void requeryData() {
+		Cursor c = getCursor();
+		if (c != null) {
+			c.requery();
+		}
+	}
+
 }

base/src/org/droidparts/adapter/cursor/EntityCursorAdapter.java → droidparts/src/org/droidparts/adapter/cursor/EntityCursorAdapter.java

@@ -73,7 +73,7 @@ public boolean delete(int position) {
 
 	private boolean requeryOnSuccess(boolean success) {
 		if (success) {
-			getCursor().requery();
+			requeryData();
 		}
 		return success;
 	}

fragments/src/org/droidparts/fragment/sherlock/DialogFragment.java → droidparts/src/org/droidparts/fragment/sherlock/DialogFragment.java

@@ -16,7 +16,7 @@
 package org.droidparts.fragment.sherlock;
 
 import org.droidparts.inject.Injector;
-import org.droidparts.util.SecretFragmentsSupportUtil;
+import org.droidparts.util.fragments.SecretFragmentsSupportUtil;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;

fragments/src/org/droidparts/fragment/stock/DialogFragment.java → droidparts/src/org/droidparts/fragment/stock/DialogFragment.java

@@ -16,7 +16,7 @@
 package org.droidparts.fragment.stock;
 
 import org.droidparts.inject.Injector;
-import org.droidparts.util.SecretFragmentsStockUtil;
+import org.droidparts.util.fragments.SecretFragmentsStockUtil;
 
 import android.app.Activity;
 import android.os.Bundle;

fragments/src/org/droidparts/fragment/support/DialogFragment.java → droidparts/src/org/droidparts/fragment/support/DialogFragment.java

@@ -16,7 +16,7 @@
 package org.droidparts.fragment.support;
 
 import org.droidparts.inject.Injector;
-import org.droidparts.util.SecretFragmentsSupportUtil;
+import org.droidparts.util.fragments.SecretFragmentsSupportUtil;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;

extra/src/org/droidparts/net/ImageFetcher.java → droidparts/src/org/droidparts/net/ImageFetcher.java

@@ -61,7 +61,7 @@ public class ImageFetcher {
 	int crossFadeMillis = 0;
 
 	public ImageFetcher(Context ctx) {
-		this(ctx, (ThreadPoolExecutor) Executors.newFixedThreadPool(1),
+		this(ctx, (ThreadPoolExecutor) Executors.newFixedThreadPool(2),
 				new RESTClient(ctx), BitmapMemoryCache.getDefaultInstance(ctx),
 				BitmapDiskCache.getDefaultInstance(ctx));
 	}

base/src/org/droidparts/reflect/util/TypeHelper.java → droidparts/src/org/droidparts/reflect/util/TypeHelper.java

@@ -158,11 +158,19 @@ public static Object[] toObjectArr(Object someArr) {
 	}
 
 	public static Object toTypeArr(Class<?> arrValType, Object[] arr) {
-		String[] arr2 = new String[arr.length];
-		for (int i = 0; i < arr.length; i++) {
-			arr2[i] = arr[i].toString();
+		if (isModel(arrValType)) {
+			Object modelArr = Array.newInstance(arrValType, arr.length);
+			for (int i = 0; i < arr.length; i++) {
+				Array.set(modelArr, i, arr[i]);
+			}
+			return modelArr;
+		} else {
+			String[] arr2 = new String[arr.length];
+			for (int i = 0; i < arr.length; i++) {
+				arr2[i] = arr[i].toString();
+			}
+			return toTypeArr(arrValType, arr2);
 		}
-		return toTypeArr(arrValType, arr2);
 	}
 
 	public static Object toTypeArr(Class<?> arrValType, String[] arr) {
@@ -222,8 +230,8 @@ public static Object toTypeArr(Class<?> arrValType, String[] arr) {
 			ArrayList<JSONArray> list = toTypeColl(JSONArray.class, arr);
 			return list.toArray(new JSONArray[list.size()]);
 		} else {
-			throw new IllegalArgumentException("Unable to convert to"
-					+ arrValType);
+			throw new IllegalArgumentException("Unable to convert to "
+					+ arrValType + ".");
 		}
 	}
 

fragments/src/org/droidparts/util/SecretFragmentsStockUtil.java → droidparts/src/org/droidparts/util/fragments/SecretFragmentsStockUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package org.droidparts.util;
+package org.droidparts.util.fragments;
 
 import android.app.Activity;
 import android.app.DialogFragment;

fragments/src/org/droidparts/util/SecretFragmentsSupportUtil.java → droidparts/src/org/droidparts/util/fragments/SecretFragmentsSupportUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package org.droidparts.util;
+package org.droidparts.util.fragments;
 
 import android.support.v4.app.DialogFragment;
 import android.support.v4.app.Fragment;

fragments/src/org/droidparts/util/SecretFragmentsUtil.java → droidparts/src/org/droidparts/util/fragments/SecretFragmentsUtil.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License. 
  */
-package org.droidparts.util;
+package org.droidparts.util.fragments;
 
 import static org.droidparts.util.ui.ViewUtils.dpToPx;
 import android.app.Activity;

extra/src/org/droidparts/util/intent/AndroidMarketHelper.java → droidparts/src/org/droidparts/util/intent/AndroidMarketHelper.java

@@ -33,7 +33,7 @@ public AndroidMarketHelper(Context ctx) {
 		this.ctx = ctx;
 	}
 
-	public void showPackage(String pkgName) {
+	public void showDetail(String pkgName) {
 		launchMarket("market://details?id=" + pkgName);
 	}