diff --git a/CHANGES b/CHANGES
index 1676c5af..d5b25f36 100644
--- a/CHANGES
+++ b/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.
diff --git a/base/AndroidManifest.xml b/base/AndroidManifest.xml
deleted file mode 100644
index ea05f816..00000000
--- a/base/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/base/pom.xml b/base/pom.xml
deleted file mode 100644
index 8e416c7e..00000000
--- a/base/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- 4.0.0
-
-
- org.droidparts
- droidparts-parent
- 1.0-SNAPSHOT
-
-
- base
- droidparts-base
- DroidParts Base
- apklib
-
-
-
- android
- android
- 2.2_r3
- provided
-
-
-
-
- src
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 1.5
- -proc:none
-
-
-
- com.jayway.maven.plugins.android.generation2
- android-maven-plugin
- true
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/base/project.properties b/base/project.properties
deleted file mode 100644
index 4c97f95d..00000000
--- a/base/project.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-android.library=true
-
-target=android-7
diff --git a/extra/.classpath b/droidparts-samples/DroidPartsGram/.classpath
similarity index 100%
rename from extra/.classpath
rename to droidparts-samples/DroidPartsGram/.classpath
diff --git a/sample/DroidPartsGram/.project b/droidparts-samples/DroidPartsGram/.project
similarity index 100%
rename from sample/DroidPartsGram/.project
rename to droidparts-samples/DroidPartsGram/.project
diff --git a/base/.settings/org.eclipse.core.resources.prefs b/droidparts-samples/DroidPartsGram/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from base/.settings/org.eclipse.core.resources.prefs
rename to droidparts-samples/DroidPartsGram/.settings/org.eclipse.core.resources.prefs
diff --git a/base/.settings/org.eclipse.core.runtime.prefs b/droidparts-samples/DroidPartsGram/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from base/.settings/org.eclipse.core.runtime.prefs
rename to droidparts-samples/DroidPartsGram/.settings/org.eclipse.core.runtime.prefs
diff --git a/base/.settings/org.eclipse.jdt.ui.prefs b/droidparts-samples/DroidPartsGram/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from base/.settings/org.eclipse.jdt.ui.prefs
rename to droidparts-samples/DroidPartsGram/.settings/org.eclipse.jdt.ui.prefs
diff --git a/sample/DroidPartsGram/AndroidManifest.xml b/droidparts-samples/DroidPartsGram/AndroidManifest.xml
similarity index 94%
rename from sample/DroidPartsGram/AndroidManifest.xml
rename to droidparts-samples/DroidPartsGram/AndroidManifest.xml
index f8f23194..50726ff7 100644
--- a/sample/DroidPartsGram/AndroidManifest.xml
+++ b/droidparts-samples/DroidPartsGram/AndroidManifest.xml
@@ -4,8 +4,8 @@
android:versionName="1.0" >
+ android:minSdkVersion="8"
+ android:targetSdkVersion="14" />
diff --git a/droidparts-samples/DroidPartsGram/project.properties b/droidparts-samples/DroidPartsGram/project.properties
new file mode 100644
index 00000000..7bc786cf
--- /dev/null
+++ b/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
\ No newline at end of file
diff --git a/sample/DroidPartsGram/res/drawable-hdpi/ic_ab_refresh.png b/droidparts-samples/DroidPartsGram/res/drawable-hdpi/ic_ab_refresh.png
similarity index 100%
rename from sample/DroidPartsGram/res/drawable-hdpi/ic_ab_refresh.png
rename to droidparts-samples/DroidPartsGram/res/drawable-hdpi/ic_ab_refresh.png
diff --git a/sample/DroidPartsGram/res/drawable-hdpi/ic_ab_settings.png b/droidparts-samples/DroidPartsGram/res/drawable-hdpi/ic_ab_settings.png
similarity index 100%
rename from sample/DroidPartsGram/res/drawable-hdpi/ic_ab_settings.png
rename to droidparts-samples/DroidPartsGram/res/drawable-hdpi/ic_ab_settings.png
diff --git a/sample/DroidPartsGram/res/drawable-mdpi/ic_ab_refresh.png b/droidparts-samples/DroidPartsGram/res/drawable-mdpi/ic_ab_refresh.png
similarity index 100%
rename from sample/DroidPartsGram/res/drawable-mdpi/ic_ab_refresh.png
rename to droidparts-samples/DroidPartsGram/res/drawable-mdpi/ic_ab_refresh.png
diff --git a/sample/DroidPartsGram/res/drawable-mdpi/ic_ab_settings.png b/droidparts-samples/DroidPartsGram/res/drawable-mdpi/ic_ab_settings.png
similarity index 100%
rename from sample/DroidPartsGram/res/drawable-mdpi/ic_ab_settings.png
rename to droidparts-samples/DroidPartsGram/res/drawable-mdpi/ic_ab_settings.png
diff --git a/sample/DroidPartsGram/res/drawable-xhdpi/ic_ab_refresh.png b/droidparts-samples/DroidPartsGram/res/drawable-xhdpi/ic_ab_refresh.png
similarity index 100%
rename from sample/DroidPartsGram/res/drawable-xhdpi/ic_ab_refresh.png
rename to droidparts-samples/DroidPartsGram/res/drawable-xhdpi/ic_ab_refresh.png
diff --git a/sample/DroidPartsGram/res/drawable-xhdpi/ic_ab_settings.png b/droidparts-samples/DroidPartsGram/res/drawable-xhdpi/ic_ab_settings.png
similarity index 100%
rename from sample/DroidPartsGram/res/drawable-xhdpi/ic_ab_settings.png
rename to droidparts-samples/DroidPartsGram/res/drawable-xhdpi/ic_ab_settings.png
diff --git a/sample/DroidPartsGram/res/drawable-xhdpi/ic_launcher.png b/droidparts-samples/DroidPartsGram/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from sample/DroidPartsGram/res/drawable-xhdpi/ic_launcher.png
rename to droidparts-samples/DroidPartsGram/res/drawable-xhdpi/ic_launcher.png
diff --git a/sample/DroidPartsGram/res/layout/dialog_image.xml b/droidparts-samples/DroidPartsGram/res/layout/dialog_image.xml
similarity index 100%
rename from sample/DroidPartsGram/res/layout/dialog_image.xml
rename to droidparts-samples/DroidPartsGram/res/layout/dialog_image.xml
diff --git a/sample/DroidPartsGram/res/layout/list_row_image.xml b/droidparts-samples/DroidPartsGram/res/layout/list_row_image.xml
similarity index 100%
rename from sample/DroidPartsGram/res/layout/list_row_image.xml
rename to droidparts-samples/DroidPartsGram/res/layout/list_row_image.xml
diff --git a/sample/DroidPartsGram/res/menu/options_image_list.xml b/droidparts-samples/DroidPartsGram/res/menu/options_image_list.xml
similarity index 100%
rename from sample/DroidPartsGram/res/menu/options_image_list.xml
rename to droidparts-samples/DroidPartsGram/res/menu/options_image_list.xml
diff --git a/sample/DroidPartsGram/res/values/dimens.xml b/droidparts-samples/DroidPartsGram/res/values/dimens.xml
similarity index 100%
rename from sample/DroidPartsGram/res/values/dimens.xml
rename to droidparts-samples/DroidPartsGram/res/values/dimens.xml
diff --git a/sample/DroidPartsGram/res/values/prefs.xml b/droidparts-samples/DroidPartsGram/res/values/prefs.xml
similarity index 100%
rename from sample/DroidPartsGram/res/values/prefs.xml
rename to droidparts-samples/DroidPartsGram/res/values/prefs.xml
diff --git a/sample/DroidPartsGram/res/values/strings.xml b/droidparts-samples/DroidPartsGram/res/values/strings.xml
similarity index 100%
rename from sample/DroidPartsGram/res/values/strings.xml
rename to droidparts-samples/DroidPartsGram/res/values/strings.xml
diff --git a/sample/DroidPartsGram/res/xml/preferences.xml b/droidparts-samples/DroidPartsGram/res/xml/preferences.xml
similarity index 100%
rename from sample/DroidPartsGram/res/xml/preferences.xml
rename to droidparts-samples/DroidPartsGram/res/xml/preferences.xml
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/Application.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/Application.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/Application.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/Application.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/DependencyProvider.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/DependencyProvider.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/DependencyProvider.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/DependencyProvider.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/activity/MainActivity.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/activity/MainActivity.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/activity/MainActivity.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/activity/MainActivity.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/activity/PopularImageListActivity.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/activity/PopularImageListActivity.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/activity/PopularImageListActivity.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/activity/PopularImageListActivity.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/activity/SettingsActivity.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/activity/SettingsActivity.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/activity/SettingsActivity.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/activity/SettingsActivity.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/adapter/ImageListAdapter.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/adapter/ImageListAdapter.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/adapter/ImageListAdapter.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/adapter/ImageListAdapter.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/contract/DB.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/contract/DB.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/contract/DB.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/contract/DB.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/contract/Instagram.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/contract/Instagram.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/contract/Instagram.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/contract/Instagram.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/fragment/ImageDetailFragment.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/fragment/ImageDetailFragment.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/fragment/ImageDetailFragment.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/fragment/ImageDetailFragment.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/fragment/ImageListFragment.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/fragment/ImageListFragment.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/fragment/ImageListFragment.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/fragment/ImageListFragment.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/model/Filter.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/model/Filter.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/model/Filter.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/model/Filter.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/model/Image.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/model/Image.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/model/Image.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/model/Image.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/persist/DBOpenHelper.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/DBOpenHelper.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/persist/DBOpenHelper.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/DBOpenHelper.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/persist/FilterEntityManager.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/FilterEntityManager.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/persist/FilterEntityManager.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/FilterEntityManager.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/persist/ImageEntityManager.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/ImageEntityManager.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/persist/ImageEntityManager.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/ImageEntityManager.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/persist/ImageSerializer.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/ImageSerializer.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/persist/ImageSerializer.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/ImageSerializer.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/persist/PrefsManager.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/PrefsManager.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/persist/PrefsManager.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/persist/PrefsManager.java
diff --git a/sample/DroidPartsGram/src/org/droidparts/gram/service/ImageIntentService.java b/droidparts-samples/DroidPartsGram/src/org/droidparts/gram/service/ImageIntentService.java
similarity index 100%
rename from sample/DroidPartsGram/src/org/droidparts/gram/service/ImageIntentService.java
rename to droidparts-samples/DroidPartsGram/src/org/droidparts/gram/service/ImageIntentService.java
diff --git a/fragments/.classpath b/droidparts-samples/droidparts-sample/.classpath
similarity index 100%
rename from fragments/.classpath
rename to droidparts-samples/droidparts-sample/.classpath
diff --git a/sample/droidparts-sample/.project b/droidparts-samples/droidparts-sample/.project
similarity index 100%
rename from sample/droidparts-sample/.project
rename to droidparts-samples/droidparts-sample/.project
diff --git a/extra/.settings/org.eclipse.core.resources.prefs b/droidparts-samples/droidparts-sample/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from extra/.settings/org.eclipse.core.resources.prefs
rename to droidparts-samples/droidparts-sample/.settings/org.eclipse.core.resources.prefs
diff --git a/extra/.settings/org.eclipse.core.runtime.prefs b/droidparts-samples/droidparts-sample/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from extra/.settings/org.eclipse.core.runtime.prefs
rename to droidparts-samples/droidparts-sample/.settings/org.eclipse.core.runtime.prefs
diff --git a/extra/.settings/org.eclipse.jdt.ui.prefs b/droidparts-samples/droidparts-sample/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from extra/.settings/org.eclipse.jdt.ui.prefs
rename to droidparts-samples/droidparts-sample/.settings/org.eclipse.jdt.ui.prefs
diff --git a/sample/droidparts-sample/AndroidManifest.xml b/droidparts-samples/droidparts-sample/AndroidManifest.xml
similarity index 91%
rename from sample/droidparts-sample/AndroidManifest.xml
rename to droidparts-samples/droidparts-sample/AndroidManifest.xml
index 343cc9c8..ef026d92 100644
--- a/sample/droidparts-sample/AndroidManifest.xml
+++ b/droidparts-samples/droidparts-sample/AndroidManifest.xml
@@ -4,7 +4,7 @@
android:versionCode="1"
android:versionName="1.0" >
-
+
- droidparts-base
+ droidparts
diff --git a/sample/DroidPartsGram/.settings/org.eclipse.core.resources.prefs b/droidparts/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from sample/DroidPartsGram/.settings/org.eclipse.core.resources.prefs
rename to droidparts/.settings/org.eclipse.core.resources.prefs
diff --git a/sample/DroidPartsGram/.settings/org.eclipse.core.runtime.prefs b/droidparts/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from sample/DroidPartsGram/.settings/org.eclipse.core.runtime.prefs
rename to droidparts/.settings/org.eclipse.core.runtime.prefs
diff --git a/base/.settings/org.eclipse.jdt.core.prefs b/droidparts/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from base/.settings/org.eclipse.jdt.core.prefs
rename to droidparts/.settings/org.eclipse.jdt.core.prefs
diff --git a/sample/DroidPartsGram/.settings/org.eclipse.jdt.ui.prefs b/droidparts/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from sample/DroidPartsGram/.settings/org.eclipse.jdt.ui.prefs
rename to droidparts/.settings/org.eclipse.jdt.ui.prefs
diff --git a/extra/AndroidManifest.xml b/droidparts/AndroidManifest.xml
similarity index 72%
rename from extra/AndroidManifest.xml
rename to droidparts/AndroidManifest.xml
index ea05f816..ed2e0344 100644
--- a/extra/AndroidManifest.xml
+++ b/droidparts/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/base/build.xml b/droidparts/build.xml
similarity index 100%
rename from base/build.xml
rename to droidparts/build.xml
diff --git a/droidparts/pom.xml b/droidparts/pom.xml
new file mode 100644
index 00000000..dc7dd294
--- /dev/null
+++ b/droidparts/pom.xml
@@ -0,0 +1,65 @@
+
+
+ 4.0.0
+
+
+ org.droidparts
+ droidparts-parent
+ 1.0-SNAPSHOT
+
+
+ droidparts
+ DroidParts
+ apklib
+
+
+
+ com.google.android
+ android
+ 4.0_r3
+ provided
+
+
+ com.google.android
+ support-v4
+
+
+ com.actionbarsherlock
+ actionbarsherlock
+ 4.2.0
+ apklib
+
+
+
+
+ src
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+
+
+ 1.5
+ -proc:none
+
+
+
+ com.jayway.maven.plugins.android.generation2
+ android-maven-plugin
+ true
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/droidparts/project.properties b/droidparts/project.properties
new file mode 100644
index 00000000..be4d72f4
--- /dev/null
+++ b/droidparts/project.properties
@@ -0,0 +1,5 @@
+android.library=true
+
+target=android-14
+
+android.library.reference.1=../../ActionBarSherlock/library
\ No newline at end of file
diff --git a/base/res/values/vals.xml b/droidparts/res/values/vals.xml
similarity index 100%
rename from base/res/values/vals.xml
rename to droidparts/res/values/vals.xml
diff --git a/base/src/org/droidparts/Application.java b/droidparts/src/org/droidparts/Application.java
similarity index 100%
rename from base/src/org/droidparts/Application.java
rename to droidparts/src/org/droidparts/Application.java
diff --git a/base/src/org/droidparts/activity/Activity.java b/droidparts/src/org/droidparts/activity/Activity.java
similarity index 100%
rename from base/src/org/droidparts/activity/Activity.java
rename to droidparts/src/org/droidparts/activity/Activity.java
diff --git a/base/src/org/droidparts/activity/ListActivity.java b/droidparts/src/org/droidparts/activity/ListActivity.java
similarity index 100%
rename from base/src/org/droidparts/activity/ListActivity.java
rename to droidparts/src/org/droidparts/activity/ListActivity.java
diff --git a/base/src/org/droidparts/activity/PreferenceActivity.java b/droidparts/src/org/droidparts/activity/PreferenceActivity.java
similarity index 100%
rename from base/src/org/droidparts/activity/PreferenceActivity.java
rename to droidparts/src/org/droidparts/activity/PreferenceActivity.java
diff --git a/fragments/src/org/droidparts/activity/sherlock/FragmentActivity.java b/droidparts/src/org/droidparts/activity/sherlock/FragmentActivity.java
similarity index 96%
rename from fragments/src/org/droidparts/activity/sherlock/FragmentActivity.java
rename to droidparts/src/org/droidparts/activity/sherlock/FragmentActivity.java
index aa9be970..bb6a865e 100644
--- a/fragments/src/org/droidparts/activity/sherlock/FragmentActivity.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/activity/sherlock/PreferenceActivity.java b/droidparts/src/org/droidparts/activity/sherlock/PreferenceActivity.java
similarity index 100%
rename from fragments/src/org/droidparts/activity/sherlock/PreferenceActivity.java
rename to droidparts/src/org/droidparts/activity/sherlock/PreferenceActivity.java
diff --git a/fragments/src/org/droidparts/activity/sherlock/SingleFragmentActivity.java b/droidparts/src/org/droidparts/activity/sherlock/SingleFragmentActivity.java
similarity index 95%
rename from fragments/src/org/droidparts/activity/sherlock/SingleFragmentActivity.java
rename to droidparts/src/org/droidparts/activity/sherlock/SingleFragmentActivity.java
index 0ce80949..1463cf32 100644
--- a/fragments/src/org/droidparts/activity/sherlock/SingleFragmentActivity.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/activity/sherlock/TabbedFragmentActivity.java b/droidparts/src/org/droidparts/activity/sherlock/TabbedFragmentActivity.java
similarity index 100%
rename from fragments/src/org/droidparts/activity/sherlock/TabbedFragmentActivity.java
rename to droidparts/src/org/droidparts/activity/sherlock/TabbedFragmentActivity.java
diff --git a/fragments/src/org/droidparts/activity/stock/FragmentActivity.java b/droidparts/src/org/droidparts/activity/stock/FragmentActivity.java
similarity index 96%
rename from fragments/src/org/droidparts/activity/stock/FragmentActivity.java
rename to droidparts/src/org/droidparts/activity/stock/FragmentActivity.java
index 82df45d4..697f01d4 100644
--- a/fragments/src/org/droidparts/activity/stock/FragmentActivity.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/activity/stock/SingleFragmentActivity.java b/droidparts/src/org/droidparts/activity/stock/SingleFragmentActivity.java
similarity index 95%
rename from fragments/src/org/droidparts/activity/stock/SingleFragmentActivity.java
rename to droidparts/src/org/droidparts/activity/stock/SingleFragmentActivity.java
index d191f1ac..cc9075c6 100644
--- a/fragments/src/org/droidparts/activity/stock/SingleFragmentActivity.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/activity/stock/TabbedFragmentActivity.java b/droidparts/src/org/droidparts/activity/stock/TabbedFragmentActivity.java
similarity index 100%
rename from fragments/src/org/droidparts/activity/stock/TabbedFragmentActivity.java
rename to droidparts/src/org/droidparts/activity/stock/TabbedFragmentActivity.java
diff --git a/fragments/src/org/droidparts/activity/support/FragmentActivity.java b/droidparts/src/org/droidparts/activity/support/FragmentActivity.java
similarity index 95%
rename from fragments/src/org/droidparts/activity/support/FragmentActivity.java
rename to droidparts/src/org/droidparts/activity/support/FragmentActivity.java
index 30a53db2..a55125ee 100644
--- a/fragments/src/org/droidparts/activity/support/FragmentActivity.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/activity/support/SingleFragmentActivity.java b/droidparts/src/org/droidparts/activity/support/SingleFragmentActivity.java
similarity index 95%
rename from fragments/src/org/droidparts/activity/support/SingleFragmentActivity.java
rename to droidparts/src/org/droidparts/activity/support/SingleFragmentActivity.java
index 1b199fc8..88065f65 100644
--- a/fragments/src/org/droidparts/activity/support/SingleFragmentActivity.java
+++ b/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;
diff --git a/base/src/org/droidparts/adapter/array/ArrayAdapter.java b/droidparts/src/org/droidparts/adapter/array/ArrayAdapter.java
similarity index 100%
rename from base/src/org/droidparts/adapter/array/ArrayAdapter.java
rename to droidparts/src/org/droidparts/adapter/array/ArrayAdapter.java
diff --git a/base/src/org/droidparts/adapter/cursor/CursorAdapter.java b/droidparts/src/org/droidparts/adapter/cursor/CursorAdapter.java
similarity index 92%
rename from base/src/org/droidparts/adapter/cursor/CursorAdapter.java
rename to droidparts/src/org/droidparts/adapter/cursor/CursorAdapter.java
index c133bf7e..646ede73 100644
--- a/base/src/org/droidparts/adapter/cursor/CursorAdapter.java
+++ b/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();
+ }
+ }
+
}
diff --git a/base/src/org/droidparts/adapter/cursor/EntityCursorAdapter.java b/droidparts/src/org/droidparts/adapter/cursor/EntityCursorAdapter.java
similarity index 98%
rename from base/src/org/droidparts/adapter/cursor/EntityCursorAdapter.java
rename to droidparts/src/org/droidparts/adapter/cursor/EntityCursorAdapter.java
index 8b79c3f8..f28f3c1e 100644
--- a/base/src/org/droidparts/adapter/cursor/EntityCursorAdapter.java
+++ b/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;
}
diff --git a/extra/src/org/droidparts/adapter/spinner/SpinnerAdapter.java b/droidparts/src/org/droidparts/adapter/spinner/SpinnerAdapter.java
similarity index 100%
rename from extra/src/org/droidparts/adapter/spinner/SpinnerAdapter.java
rename to droidparts/src/org/droidparts/adapter/spinner/SpinnerAdapter.java
diff --git a/extra/src/org/droidparts/adapter/spinner/StringSpinnerAdapter.java b/droidparts/src/org/droidparts/adapter/spinner/StringSpinnerAdapter.java
similarity index 100%
rename from extra/src/org/droidparts/adapter/spinner/StringSpinnerAdapter.java
rename to droidparts/src/org/droidparts/adapter/spinner/StringSpinnerAdapter.java
diff --git a/base/src/org/droidparts/adapter/tag/AdapterTag.java b/droidparts/src/org/droidparts/adapter/tag/AdapterTag.java
similarity index 100%
rename from base/src/org/droidparts/adapter/tag/AdapterTag.java
rename to droidparts/src/org/droidparts/adapter/tag/AdapterTag.java
diff --git a/extra/src/org/droidparts/adapter/tag/IconText2Tag.java b/droidparts/src/org/droidparts/adapter/tag/IconText2Tag.java
similarity index 100%
rename from extra/src/org/droidparts/adapter/tag/IconText2Tag.java
rename to droidparts/src/org/droidparts/adapter/tag/IconText2Tag.java
diff --git a/extra/src/org/droidparts/adapter/tag/Text1Tag.java b/droidparts/src/org/droidparts/adapter/tag/Text1Tag.java
similarity index 100%
rename from extra/src/org/droidparts/adapter/tag/Text1Tag.java
rename to droidparts/src/org/droidparts/adapter/tag/Text1Tag.java
diff --git a/extra/src/org/droidparts/adapter/tag/Text2Tag.java b/droidparts/src/org/droidparts/adapter/tag/Text2Tag.java
similarity index 100%
rename from extra/src/org/droidparts/adapter/tag/Text2Tag.java
rename to droidparts/src/org/droidparts/adapter/tag/Text2Tag.java
diff --git a/extra/src/org/droidparts/adapter/ui/TextWatcherAdapter.java b/droidparts/src/org/droidparts/adapter/ui/TextWatcherAdapter.java
similarity index 100%
rename from extra/src/org/droidparts/adapter/ui/TextWatcherAdapter.java
rename to droidparts/src/org/droidparts/adapter/ui/TextWatcherAdapter.java
diff --git a/base/src/org/droidparts/annotation/inject/InjectBundleExtra.java b/droidparts/src/org/droidparts/annotation/inject/InjectBundleExtra.java
similarity index 100%
rename from base/src/org/droidparts/annotation/inject/InjectBundleExtra.java
rename to droidparts/src/org/droidparts/annotation/inject/InjectBundleExtra.java
diff --git a/base/src/org/droidparts/annotation/inject/InjectDependency.java b/droidparts/src/org/droidparts/annotation/inject/InjectDependency.java
similarity index 100%
rename from base/src/org/droidparts/annotation/inject/InjectDependency.java
rename to droidparts/src/org/droidparts/annotation/inject/InjectDependency.java
diff --git a/base/src/org/droidparts/annotation/inject/InjectFragment.java b/droidparts/src/org/droidparts/annotation/inject/InjectFragment.java
similarity index 100%
rename from base/src/org/droidparts/annotation/inject/InjectFragment.java
rename to droidparts/src/org/droidparts/annotation/inject/InjectFragment.java
diff --git a/base/src/org/droidparts/annotation/inject/InjectParentActivity.java b/droidparts/src/org/droidparts/annotation/inject/InjectParentActivity.java
similarity index 100%
rename from base/src/org/droidparts/annotation/inject/InjectParentActivity.java
rename to droidparts/src/org/droidparts/annotation/inject/InjectParentActivity.java
diff --git a/base/src/org/droidparts/annotation/inject/InjectResource.java b/droidparts/src/org/droidparts/annotation/inject/InjectResource.java
similarity index 100%
rename from base/src/org/droidparts/annotation/inject/InjectResource.java
rename to droidparts/src/org/droidparts/annotation/inject/InjectResource.java
diff --git a/base/src/org/droidparts/annotation/inject/InjectSystemService.java b/droidparts/src/org/droidparts/annotation/inject/InjectSystemService.java
similarity index 100%
rename from base/src/org/droidparts/annotation/inject/InjectSystemService.java
rename to droidparts/src/org/droidparts/annotation/inject/InjectSystemService.java
diff --git a/base/src/org/droidparts/annotation/inject/InjectView.java b/droidparts/src/org/droidparts/annotation/inject/InjectView.java
similarity index 100%
rename from base/src/org/droidparts/annotation/inject/InjectView.java
rename to droidparts/src/org/droidparts/annotation/inject/InjectView.java
diff --git a/base/src/org/droidparts/annotation/json/Key.java b/droidparts/src/org/droidparts/annotation/json/Key.java
similarity index 100%
rename from base/src/org/droidparts/annotation/json/Key.java
rename to droidparts/src/org/droidparts/annotation/json/Key.java
diff --git a/base/src/org/droidparts/annotation/sql/Column.java b/droidparts/src/org/droidparts/annotation/sql/Column.java
similarity index 100%
rename from base/src/org/droidparts/annotation/sql/Column.java
rename to droidparts/src/org/droidparts/annotation/sql/Column.java
diff --git a/base/src/org/droidparts/annotation/sql/Table.java b/droidparts/src/org/droidparts/annotation/sql/Table.java
similarity index 100%
rename from base/src/org/droidparts/annotation/sql/Table.java
rename to droidparts/src/org/droidparts/annotation/sql/Table.java
diff --git a/base/src/org/droidparts/contract/AlterableContent.java b/droidparts/src/org/droidparts/contract/AlterableContent.java
similarity index 100%
rename from base/src/org/droidparts/contract/AlterableContent.java
rename to droidparts/src/org/droidparts/contract/AlterableContent.java
diff --git a/base/src/org/droidparts/contract/Constants.java b/droidparts/src/org/droidparts/contract/Constants.java
similarity index 100%
rename from base/src/org/droidparts/contract/Constants.java
rename to droidparts/src/org/droidparts/contract/Constants.java
diff --git a/base/src/org/droidparts/contract/DB.java b/droidparts/src/org/droidparts/contract/DB.java
similarity index 100%
rename from base/src/org/droidparts/contract/DB.java
rename to droidparts/src/org/droidparts/contract/DB.java
diff --git a/base/src/org/droidparts/contract/SQL.java b/droidparts/src/org/droidparts/contract/SQL.java
similarity index 100%
rename from base/src/org/droidparts/contract/SQL.java
rename to droidparts/src/org/droidparts/contract/SQL.java
diff --git a/fragments/src/org/droidparts/fragment/sherlock/DialogFragment.java b/droidparts/src/org/droidparts/fragment/sherlock/DialogFragment.java
similarity index 96%
rename from fragments/src/org/droidparts/fragment/sherlock/DialogFragment.java
rename to droidparts/src/org/droidparts/fragment/sherlock/DialogFragment.java
index f7d8c92d..045a69b1 100644
--- a/fragments/src/org/droidparts/fragment/sherlock/DialogFragment.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/fragment/sherlock/Fragment.java b/droidparts/src/org/droidparts/fragment/sherlock/Fragment.java
similarity index 100%
rename from fragments/src/org/droidparts/fragment/sherlock/Fragment.java
rename to droidparts/src/org/droidparts/fragment/sherlock/Fragment.java
diff --git a/fragments/src/org/droidparts/fragment/sherlock/ListFragment.java b/droidparts/src/org/droidparts/fragment/sherlock/ListFragment.java
similarity index 100%
rename from fragments/src/org/droidparts/fragment/sherlock/ListFragment.java
rename to droidparts/src/org/droidparts/fragment/sherlock/ListFragment.java
diff --git a/fragments/src/org/droidparts/fragment/stock/DialogFragment.java b/droidparts/src/org/droidparts/fragment/stock/DialogFragment.java
similarity index 96%
rename from fragments/src/org/droidparts/fragment/stock/DialogFragment.java
rename to droidparts/src/org/droidparts/fragment/stock/DialogFragment.java
index 213557df..6526d6a6 100644
--- a/fragments/src/org/droidparts/fragment/stock/DialogFragment.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/fragment/stock/Fragment.java b/droidparts/src/org/droidparts/fragment/stock/Fragment.java
similarity index 100%
rename from fragments/src/org/droidparts/fragment/stock/Fragment.java
rename to droidparts/src/org/droidparts/fragment/stock/Fragment.java
diff --git a/fragments/src/org/droidparts/fragment/stock/ListFragment.java b/droidparts/src/org/droidparts/fragment/stock/ListFragment.java
similarity index 100%
rename from fragments/src/org/droidparts/fragment/stock/ListFragment.java
rename to droidparts/src/org/droidparts/fragment/stock/ListFragment.java
diff --git a/fragments/src/org/droidparts/fragment/support/DialogFragment.java b/droidparts/src/org/droidparts/fragment/support/DialogFragment.java
similarity index 96%
rename from fragments/src/org/droidparts/fragment/support/DialogFragment.java
rename to droidparts/src/org/droidparts/fragment/support/DialogFragment.java
index 3bf84d23..934f4363 100644
--- a/fragments/src/org/droidparts/fragment/support/DialogFragment.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/fragment/support/Fragment.java b/droidparts/src/org/droidparts/fragment/support/Fragment.java
similarity index 100%
rename from fragments/src/org/droidparts/fragment/support/Fragment.java
rename to droidparts/src/org/droidparts/fragment/support/Fragment.java
diff --git a/fragments/src/org/droidparts/fragment/support/ListFragment.java b/droidparts/src/org/droidparts/fragment/support/ListFragment.java
similarity index 100%
rename from fragments/src/org/droidparts/fragment/support/ListFragment.java
rename to droidparts/src/org/droidparts/fragment/support/ListFragment.java
diff --git a/extra/src/org/droidparts/http/CookieJar.java b/droidparts/src/org/droidparts/http/CookieJar.java
similarity index 100%
rename from extra/src/org/droidparts/http/CookieJar.java
rename to droidparts/src/org/droidparts/http/CookieJar.java
diff --git a/extra/src/org/droidparts/http/HTTPException.java b/droidparts/src/org/droidparts/http/HTTPException.java
similarity index 100%
rename from extra/src/org/droidparts/http/HTTPException.java
rename to droidparts/src/org/droidparts/http/HTTPException.java
diff --git a/extra/src/org/droidparts/http/HTTPResponse.java b/droidparts/src/org/droidparts/http/HTTPResponse.java
similarity index 100%
rename from extra/src/org/droidparts/http/HTTPResponse.java
rename to droidparts/src/org/droidparts/http/HTTPResponse.java
diff --git a/extra/src/org/droidparts/http/RESTClient.java b/droidparts/src/org/droidparts/http/RESTClient.java
similarity index 100%
rename from extra/src/org/droidparts/http/RESTClient.java
rename to droidparts/src/org/droidparts/http/RESTClient.java
diff --git a/extra/src/org/droidparts/http/RESTClient2.java b/droidparts/src/org/droidparts/http/RESTClient2.java
similarity index 100%
rename from extra/src/org/droidparts/http/RESTClient2.java
rename to droidparts/src/org/droidparts/http/RESTClient2.java
diff --git a/extra/src/org/droidparts/http/worker/HTTPInputStream.java b/droidparts/src/org/droidparts/http/worker/HTTPInputStream.java
similarity index 100%
rename from extra/src/org/droidparts/http/worker/HTTPInputStream.java
rename to droidparts/src/org/droidparts/http/worker/HTTPInputStream.java
diff --git a/extra/src/org/droidparts/http/worker/HTTPWorker.java b/droidparts/src/org/droidparts/http/worker/HTTPWorker.java
similarity index 100%
rename from extra/src/org/droidparts/http/worker/HTTPWorker.java
rename to droidparts/src/org/droidparts/http/worker/HTTPWorker.java
diff --git a/extra/src/org/droidparts/http/worker/HttpClientWorker.java b/droidparts/src/org/droidparts/http/worker/HttpClientWorker.java
similarity index 100%
rename from extra/src/org/droidparts/http/worker/HttpClientWorker.java
rename to droidparts/src/org/droidparts/http/worker/HttpClientWorker.java
diff --git a/extra/src/org/droidparts/http/worker/HttpURLConnectionWorker.java b/droidparts/src/org/droidparts/http/worker/HttpURLConnectionWorker.java
similarity index 100%
rename from extra/src/org/droidparts/http/worker/HttpURLConnectionWorker.java
rename to droidparts/src/org/droidparts/http/worker/HttpURLConnectionWorker.java
diff --git a/base/src/org/droidparts/inject/AbstractDependencyProvider.java b/droidparts/src/org/droidparts/inject/AbstractDependencyProvider.java
similarity index 100%
rename from base/src/org/droidparts/inject/AbstractDependencyProvider.java
rename to droidparts/src/org/droidparts/inject/AbstractDependencyProvider.java
diff --git a/base/src/org/droidparts/inject/Injectable.java b/droidparts/src/org/droidparts/inject/Injectable.java
similarity index 100%
rename from base/src/org/droidparts/inject/Injectable.java
rename to droidparts/src/org/droidparts/inject/Injectable.java
diff --git a/base/src/org/droidparts/inject/Injector.java b/droidparts/src/org/droidparts/inject/Injector.java
similarity index 100%
rename from base/src/org/droidparts/inject/Injector.java
rename to droidparts/src/org/droidparts/inject/Injector.java
diff --git a/base/src/org/droidparts/inject/injector/BundleExtraReader.java b/droidparts/src/org/droidparts/inject/injector/BundleExtraReader.java
similarity index 100%
rename from base/src/org/droidparts/inject/injector/BundleExtraReader.java
rename to droidparts/src/org/droidparts/inject/injector/BundleExtraReader.java
diff --git a/base/src/org/droidparts/inject/injector/DependencyReader.java b/droidparts/src/org/droidparts/inject/injector/DependencyReader.java
similarity index 100%
rename from base/src/org/droidparts/inject/injector/DependencyReader.java
rename to droidparts/src/org/droidparts/inject/injector/DependencyReader.java
diff --git a/fragments/src/org/droidparts/inject/injector/FragmentsInjectorDelegate.java b/droidparts/src/org/droidparts/inject/injector/FragmentsInjectorDelegate.java
similarity index 100%
rename from fragments/src/org/droidparts/inject/injector/FragmentsInjectorDelegate.java
rename to droidparts/src/org/droidparts/inject/injector/FragmentsInjectorDelegate.java
diff --git a/base/src/org/droidparts/inject/injector/InjectorDelegate.java b/droidparts/src/org/droidparts/inject/injector/InjectorDelegate.java
similarity index 100%
rename from base/src/org/droidparts/inject/injector/InjectorDelegate.java
rename to droidparts/src/org/droidparts/inject/injector/InjectorDelegate.java
diff --git a/fragments/src/org/droidparts/inject/injector/NativeFragmentReader.java b/droidparts/src/org/droidparts/inject/injector/NativeFragmentReader.java
similarity index 100%
rename from fragments/src/org/droidparts/inject/injector/NativeFragmentReader.java
rename to droidparts/src/org/droidparts/inject/injector/NativeFragmentReader.java
diff --git a/fragments/src/org/droidparts/inject/injector/NativeParentActivityReader.java b/droidparts/src/org/droidparts/inject/injector/NativeParentActivityReader.java
similarity index 100%
rename from fragments/src/org/droidparts/inject/injector/NativeParentActivityReader.java
rename to droidparts/src/org/droidparts/inject/injector/NativeParentActivityReader.java
diff --git a/base/src/org/droidparts/inject/injector/ResourceReader.java b/droidparts/src/org/droidparts/inject/injector/ResourceReader.java
similarity index 100%
rename from base/src/org/droidparts/inject/injector/ResourceReader.java
rename to droidparts/src/org/droidparts/inject/injector/ResourceReader.java
diff --git a/fragments/src/org/droidparts/inject/injector/SupportFragmentReader.java b/droidparts/src/org/droidparts/inject/injector/SupportFragmentReader.java
similarity index 100%
rename from fragments/src/org/droidparts/inject/injector/SupportFragmentReader.java
rename to droidparts/src/org/droidparts/inject/injector/SupportFragmentReader.java
diff --git a/fragments/src/org/droidparts/inject/injector/SupportParentActivityReader.java b/droidparts/src/org/droidparts/inject/injector/SupportParentActivityReader.java
similarity index 100%
rename from fragments/src/org/droidparts/inject/injector/SupportParentActivityReader.java
rename to droidparts/src/org/droidparts/inject/injector/SupportParentActivityReader.java
diff --git a/base/src/org/droidparts/inject/injector/SystemServiceReader.java b/droidparts/src/org/droidparts/inject/injector/SystemServiceReader.java
similarity index 100%
rename from base/src/org/droidparts/inject/injector/SystemServiceReader.java
rename to droidparts/src/org/droidparts/inject/injector/SystemServiceReader.java
diff --git a/base/src/org/droidparts/inject/injector/ViewAndPreferenceReader.java b/droidparts/src/org/droidparts/inject/injector/ViewAndPreferenceReader.java
similarity index 100%
rename from base/src/org/droidparts/inject/injector/ViewAndPreferenceReader.java
rename to droidparts/src/org/droidparts/inject/injector/ViewAndPreferenceReader.java
diff --git a/base/src/org/droidparts/model/Entity.java b/droidparts/src/org/droidparts/model/Entity.java
similarity index 100%
rename from base/src/org/droidparts/model/Entity.java
rename to droidparts/src/org/droidparts/model/Entity.java
diff --git a/base/src/org/droidparts/model/Model.java b/droidparts/src/org/droidparts/model/Model.java
similarity index 100%
rename from base/src/org/droidparts/model/Model.java
rename to droidparts/src/org/droidparts/model/Model.java
diff --git a/extra/src/org/droidparts/net/ImageFetchListener.java b/droidparts/src/org/droidparts/net/ImageFetchListener.java
similarity index 100%
rename from extra/src/org/droidparts/net/ImageFetchListener.java
rename to droidparts/src/org/droidparts/net/ImageFetchListener.java
diff --git a/extra/src/org/droidparts/net/ImageFetcher.java b/droidparts/src/org/droidparts/net/ImageFetcher.java
similarity index 99%
rename from extra/src/org/droidparts/net/ImageFetcher.java
rename to droidparts/src/org/droidparts/net/ImageFetcher.java
index 8e821ff1..c4ffb2cf 100644
--- a/extra/src/org/droidparts/net/ImageFetcher.java
+++ b/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));
}
diff --git a/extra/src/org/droidparts/net/ImageReshaper.java b/droidparts/src/org/droidparts/net/ImageReshaper.java
similarity index 100%
rename from extra/src/org/droidparts/net/ImageReshaper.java
rename to droidparts/src/org/droidparts/net/ImageReshaper.java
diff --git a/extra/src/org/droidparts/net/cache/BitmapCache.java b/droidparts/src/org/droidparts/net/cache/BitmapCache.java
similarity index 100%
rename from extra/src/org/droidparts/net/cache/BitmapCache.java
rename to droidparts/src/org/droidparts/net/cache/BitmapCache.java
diff --git a/extra/src/org/droidparts/net/cache/BitmapDiskCache.java b/droidparts/src/org/droidparts/net/cache/BitmapDiskCache.java
similarity index 100%
rename from extra/src/org/droidparts/net/cache/BitmapDiskCache.java
rename to droidparts/src/org/droidparts/net/cache/BitmapDiskCache.java
diff --git a/extra/src/org/droidparts/net/cache/BitmapMemoryCache.java b/droidparts/src/org/droidparts/net/cache/BitmapMemoryCache.java
similarity index 100%
rename from extra/src/org/droidparts/net/cache/BitmapMemoryCache.java
rename to droidparts/src/org/droidparts/net/cache/BitmapMemoryCache.java
diff --git a/fragments/src/org/droidparts/net/cache/StockBitmapLruCache.java b/droidparts/src/org/droidparts/net/cache/StockBitmapLruCache.java
similarity index 100%
rename from fragments/src/org/droidparts/net/cache/StockBitmapLruCache.java
rename to droidparts/src/org/droidparts/net/cache/StockBitmapLruCache.java
diff --git a/fragments/src/org/droidparts/net/cache/SupportBitmapLruCache.java b/droidparts/src/org/droidparts/net/cache/SupportBitmapLruCache.java
similarity index 100%
rename from fragments/src/org/droidparts/net/cache/SupportBitmapLruCache.java
rename to droidparts/src/org/droidparts/net/cache/SupportBitmapLruCache.java
diff --git a/extra/src/org/droidparts/net/concurrent/ConnectivityAwareExecutor.java b/droidparts/src/org/droidparts/net/concurrent/ConnectivityAwareExecutor.java
similarity index 100%
rename from extra/src/org/droidparts/net/concurrent/ConnectivityAwareExecutor.java
rename to droidparts/src/org/droidparts/net/concurrent/ConnectivityAwareExecutor.java
diff --git a/base/src/org/droidparts/persist/AbstractPrefsManager.java b/droidparts/src/org/droidparts/persist/AbstractPrefsManager.java
similarity index 100%
rename from base/src/org/droidparts/persist/AbstractPrefsManager.java
rename to droidparts/src/org/droidparts/persist/AbstractPrefsManager.java
diff --git a/base/src/org/droidparts/persist/json/JSONSerializer.java b/droidparts/src/org/droidparts/persist/json/JSONSerializer.java
similarity index 100%
rename from base/src/org/droidparts/persist/json/JSONSerializer.java
rename to droidparts/src/org/droidparts/persist/json/JSONSerializer.java
diff --git a/base/src/org/droidparts/persist/sql/AbstractDBOpenHelper.java b/droidparts/src/org/droidparts/persist/sql/AbstractDBOpenHelper.java
similarity index 100%
rename from base/src/org/droidparts/persist/sql/AbstractDBOpenHelper.java
rename to droidparts/src/org/droidparts/persist/sql/AbstractDBOpenHelper.java
diff --git a/extra/src/org/droidparts/persist/sql/AbstractDBOpenHelper2.java b/droidparts/src/org/droidparts/persist/sql/AbstractDBOpenHelper2.java
similarity index 100%
rename from extra/src/org/droidparts/persist/sql/AbstractDBOpenHelper2.java
rename to droidparts/src/org/droidparts/persist/sql/AbstractDBOpenHelper2.java
diff --git a/base/src/org/droidparts/persist/sql/AbstractEntityManager.java b/droidparts/src/org/droidparts/persist/sql/AbstractEntityManager.java
similarity index 100%
rename from base/src/org/droidparts/persist/sql/AbstractEntityManager.java
rename to droidparts/src/org/droidparts/persist/sql/AbstractEntityManager.java
diff --git a/base/src/org/droidparts/persist/sql/EntityManager.java b/droidparts/src/org/droidparts/persist/sql/EntityManager.java
similarity index 100%
rename from base/src/org/droidparts/persist/sql/EntityManager.java
rename to droidparts/src/org/droidparts/persist/sql/EntityManager.java
diff --git a/base/src/org/droidparts/persist/sql/stmt/Delete.java b/droidparts/src/org/droidparts/persist/sql/stmt/Delete.java
similarity index 100%
rename from base/src/org/droidparts/persist/sql/stmt/Delete.java
rename to droidparts/src/org/droidparts/persist/sql/stmt/Delete.java
diff --git a/base/src/org/droidparts/persist/sql/stmt/Is.java b/droidparts/src/org/droidparts/persist/sql/stmt/Is.java
similarity index 100%
rename from base/src/org/droidparts/persist/sql/stmt/Is.java
rename to droidparts/src/org/droidparts/persist/sql/stmt/Is.java
diff --git a/base/src/org/droidparts/persist/sql/stmt/Select.java b/droidparts/src/org/droidparts/persist/sql/stmt/Select.java
similarity index 100%
rename from base/src/org/droidparts/persist/sql/stmt/Select.java
rename to droidparts/src/org/droidparts/persist/sql/stmt/Select.java
diff --git a/base/src/org/droidparts/persist/sql/stmt/Statement.java b/droidparts/src/org/droidparts/persist/sql/stmt/Statement.java
similarity index 100%
rename from base/src/org/droidparts/persist/sql/stmt/Statement.java
rename to droidparts/src/org/droidparts/persist/sql/stmt/Statement.java
diff --git a/base/src/org/droidparts/persist/sql/stmt/Update.java b/droidparts/src/org/droidparts/persist/sql/stmt/Update.java
similarity index 100%
rename from base/src/org/droidparts/persist/sql/stmt/Update.java
rename to droidparts/src/org/droidparts/persist/sql/stmt/Update.java
diff --git a/base/src/org/droidparts/reflect/AnnBuilder.java b/droidparts/src/org/droidparts/reflect/AnnBuilder.java
similarity index 100%
rename from base/src/org/droidparts/reflect/AnnBuilder.java
rename to droidparts/src/org/droidparts/reflect/AnnBuilder.java
diff --git a/base/src/org/droidparts/reflect/FieldSpecBuilder.java b/droidparts/src/org/droidparts/reflect/FieldSpecBuilder.java
similarity index 100%
rename from base/src/org/droidparts/reflect/FieldSpecBuilder.java
rename to droidparts/src/org/droidparts/reflect/FieldSpecBuilder.java
diff --git a/base/src/org/droidparts/reflect/ann/Ann.java b/droidparts/src/org/droidparts/reflect/ann/Ann.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/Ann.java
rename to droidparts/src/org/droidparts/reflect/ann/Ann.java
diff --git a/base/src/org/droidparts/reflect/ann/FieldSpec.java b/droidparts/src/org/droidparts/reflect/ann/FieldSpec.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/FieldSpec.java
rename to droidparts/src/org/droidparts/reflect/ann/FieldSpec.java
diff --git a/base/src/org/droidparts/reflect/ann/inject/InjectAnn.java b/droidparts/src/org/droidparts/reflect/ann/inject/InjectAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/inject/InjectAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/inject/InjectAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/inject/InjectBundleExtraAnn.java b/droidparts/src/org/droidparts/reflect/ann/inject/InjectBundleExtraAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/inject/InjectBundleExtraAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/inject/InjectBundleExtraAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/inject/InjectDependencyAnn.java b/droidparts/src/org/droidparts/reflect/ann/inject/InjectDependencyAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/inject/InjectDependencyAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/inject/InjectDependencyAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/inject/InjectFragmentAnn.java b/droidparts/src/org/droidparts/reflect/ann/inject/InjectFragmentAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/inject/InjectFragmentAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/inject/InjectFragmentAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/inject/InjectParentActivityAnn.java b/droidparts/src/org/droidparts/reflect/ann/inject/InjectParentActivityAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/inject/InjectParentActivityAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/inject/InjectParentActivityAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/inject/InjectResourceAnn.java b/droidparts/src/org/droidparts/reflect/ann/inject/InjectResourceAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/inject/InjectResourceAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/inject/InjectResourceAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/inject/InjectSystemServiceAnn.java b/droidparts/src/org/droidparts/reflect/ann/inject/InjectSystemServiceAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/inject/InjectSystemServiceAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/inject/InjectSystemServiceAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/inject/InjectViewAnn.java b/droidparts/src/org/droidparts/reflect/ann/inject/InjectViewAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/inject/InjectViewAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/inject/InjectViewAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/json/KeyAnn.java b/droidparts/src/org/droidparts/reflect/ann/json/KeyAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/json/KeyAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/json/KeyAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/sql/ColumnAnn.java b/droidparts/src/org/droidparts/reflect/ann/sql/ColumnAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/sql/ColumnAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/sql/ColumnAnn.java
diff --git a/base/src/org/droidparts/reflect/ann/sql/TableAnn.java b/droidparts/src/org/droidparts/reflect/ann/sql/TableAnn.java
similarity index 100%
rename from base/src/org/droidparts/reflect/ann/sql/TableAnn.java
rename to droidparts/src/org/droidparts/reflect/ann/sql/TableAnn.java
diff --git a/base/src/org/droidparts/reflect/util/ReflectionUtils.java b/droidparts/src/org/droidparts/reflect/util/ReflectionUtils.java
similarity index 100%
rename from base/src/org/droidparts/reflect/util/ReflectionUtils.java
rename to droidparts/src/org/droidparts/reflect/util/ReflectionUtils.java
diff --git a/base/src/org/droidparts/reflect/util/TypeHelper.java b/droidparts/src/org/droidparts/reflect/util/TypeHelper.java
similarity index 95%
rename from base/src/org/droidparts/reflect/util/TypeHelper.java
rename to droidparts/src/org/droidparts/reflect/util/TypeHelper.java
index 5baaf708..cd7b58e9 100644
--- a/base/src/org/droidparts/reflect/util/TypeHelper.java
+++ b/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 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 + ".");
}
}
diff --git a/base/src/org/droidparts/service/IntentService.java b/droidparts/src/org/droidparts/service/IntentService.java
similarity index 100%
rename from base/src/org/droidparts/service/IntentService.java
rename to droidparts/src/org/droidparts/service/IntentService.java
diff --git a/extra/src/org/droidparts/service/MainThreadResultReceiver.java b/droidparts/src/org/droidparts/service/MainThreadResultReceiver.java
similarity index 100%
rename from extra/src/org/droidparts/service/MainThreadResultReceiver.java
rename to droidparts/src/org/droidparts/service/MainThreadResultReceiver.java
diff --git a/base/src/org/droidparts/service/Service.java b/droidparts/src/org/droidparts/service/Service.java
similarity index 100%
rename from base/src/org/droidparts/service/Service.java
rename to droidparts/src/org/droidparts/service/Service.java
diff --git a/base/src/org/droidparts/service/SimpleIntentService.java b/droidparts/src/org/droidparts/service/SimpleIntentService.java
similarity index 100%
rename from base/src/org/droidparts/service/SimpleIntentService.java
rename to droidparts/src/org/droidparts/service/SimpleIntentService.java
diff --git a/base/src/org/droidparts/task/AsyncTask.java b/droidparts/src/org/droidparts/task/AsyncTask.java
similarity index 100%
rename from base/src/org/droidparts/task/AsyncTask.java
rename to droidparts/src/org/droidparts/task/AsyncTask.java
diff --git a/base/src/org/droidparts/task/SimpleAsyncTask.java b/droidparts/src/org/droidparts/task/SimpleAsyncTask.java
similarity index 100%
rename from base/src/org/droidparts/task/SimpleAsyncTask.java
rename to droidparts/src/org/droidparts/task/SimpleAsyncTask.java
diff --git a/base/src/org/droidparts/task/listener/AsyncTaskProgressListener.java b/droidparts/src/org/droidparts/task/listener/AsyncTaskProgressListener.java
similarity index 100%
rename from base/src/org/droidparts/task/listener/AsyncTaskProgressListener.java
rename to droidparts/src/org/droidparts/task/listener/AsyncTaskProgressListener.java
diff --git a/base/src/org/droidparts/task/listener/AsyncTaskResultListener.java b/droidparts/src/org/droidparts/task/listener/AsyncTaskResultListener.java
similarity index 100%
rename from base/src/org/droidparts/task/listener/AsyncTaskResultListener.java
rename to droidparts/src/org/droidparts/task/listener/AsyncTaskResultListener.java
diff --git a/base/src/org/droidparts/task/listener/SimpleAsyncTaskProgressListener.java b/droidparts/src/org/droidparts/task/listener/SimpleAsyncTaskProgressListener.java
similarity index 100%
rename from base/src/org/droidparts/task/listener/SimpleAsyncTaskProgressListener.java
rename to droidparts/src/org/droidparts/task/listener/SimpleAsyncTaskProgressListener.java
diff --git a/extra/src/org/droidparts/util/AppUtils.java b/droidparts/src/org/droidparts/util/AppUtils.java
similarity index 100%
rename from extra/src/org/droidparts/util/AppUtils.java
rename to droidparts/src/org/droidparts/util/AppUtils.java
diff --git a/extra/src/org/droidparts/util/AppUtils2.java b/droidparts/src/org/droidparts/util/AppUtils2.java
similarity index 100%
rename from extra/src/org/droidparts/util/AppUtils2.java
rename to droidparts/src/org/droidparts/util/AppUtils2.java
diff --git a/base/src/org/droidparts/util/Arrays2.java b/droidparts/src/org/droidparts/util/Arrays2.java
similarity index 100%
rename from base/src/org/droidparts/util/Arrays2.java
rename to droidparts/src/org/droidparts/util/Arrays2.java
diff --git a/base/src/org/droidparts/util/L.java b/droidparts/src/org/droidparts/util/L.java
similarity index 100%
rename from base/src/org/droidparts/util/L.java
rename to droidparts/src/org/droidparts/util/L.java
diff --git a/extra/src/org/droidparts/util/MiscUtils.java b/droidparts/src/org/droidparts/util/MiscUtils.java
similarity index 100%
rename from extra/src/org/droidparts/util/MiscUtils.java
rename to droidparts/src/org/droidparts/util/MiscUtils.java
diff --git a/base/src/org/droidparts/util/PersistUtils.java b/droidparts/src/org/droidparts/util/PersistUtils.java
similarity index 100%
rename from base/src/org/droidparts/util/PersistUtils.java
rename to droidparts/src/org/droidparts/util/PersistUtils.java
diff --git a/base/src/org/droidparts/util/Strings.java b/droidparts/src/org/droidparts/util/Strings.java
similarity index 100%
rename from base/src/org/droidparts/util/Strings.java
rename to droidparts/src/org/droidparts/util/Strings.java
diff --git a/extra/src/org/droidparts/util/crypto/Crypter.java b/droidparts/src/org/droidparts/util/crypto/Crypter.java
similarity index 100%
rename from extra/src/org/droidparts/util/crypto/Crypter.java
rename to droidparts/src/org/droidparts/util/crypto/Crypter.java
diff --git a/extra/src/org/droidparts/util/crypto/HashCalc.java b/droidparts/src/org/droidparts/util/crypto/HashCalc.java
similarity index 100%
rename from extra/src/org/droidparts/util/crypto/HashCalc.java
rename to droidparts/src/org/droidparts/util/crypto/HashCalc.java
diff --git a/fragments/src/org/droidparts/util/SecretFragmentsStockUtil.java b/droidparts/src/org/droidparts/util/fragments/SecretFragmentsStockUtil.java
similarity index 98%
rename from fragments/src/org/droidparts/util/SecretFragmentsStockUtil.java
rename to droidparts/src/org/droidparts/util/fragments/SecretFragmentsStockUtil.java
index 29f43d53..d36ca066 100644
--- a/fragments/src/org/droidparts/util/SecretFragmentsStockUtil.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/util/SecretFragmentsSupportUtil.java b/droidparts/src/org/droidparts/util/fragments/SecretFragmentsSupportUtil.java
similarity index 98%
rename from fragments/src/org/droidparts/util/SecretFragmentsSupportUtil.java
rename to droidparts/src/org/droidparts/util/fragments/SecretFragmentsSupportUtil.java
index 56226f28..58820ae3 100644
--- a/fragments/src/org/droidparts/util/SecretFragmentsSupportUtil.java
+++ b/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;
diff --git a/fragments/src/org/droidparts/util/SecretFragmentsUtil.java b/droidparts/src/org/droidparts/util/fragments/SecretFragmentsUtil.java
similarity index 97%
rename from fragments/src/org/droidparts/util/SecretFragmentsUtil.java
rename to droidparts/src/org/droidparts/util/fragments/SecretFragmentsUtil.java
index 9c911476..d0279c7c 100644
--- a/fragments/src/org/droidparts/util/SecretFragmentsUtil.java
+++ b/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;
diff --git a/base/src/org/droidparts/util/inner/ResourceUtils.java b/droidparts/src/org/droidparts/util/inner/ResourceUtils.java
similarity index 100%
rename from base/src/org/droidparts/util/inner/ResourceUtils.java
rename to droidparts/src/org/droidparts/util/inner/ResourceUtils.java
diff --git a/extra/src/org/droidparts/util/intent/AndroidMarketHelper.java b/droidparts/src/org/droidparts/util/intent/AndroidMarketHelper.java
similarity index 97%
rename from extra/src/org/droidparts/util/intent/AndroidMarketHelper.java
rename to droidparts/src/org/droidparts/util/intent/AndroidMarketHelper.java
index eae2378e..b9c7c740 100644
--- a/extra/src/org/droidparts/util/intent/AndroidMarketHelper.java
+++ b/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);
}
diff --git a/extra/src/org/droidparts/util/intent/IntentFactory.java b/droidparts/src/org/droidparts/util/intent/IntentFactory.java
similarity index 100%
rename from extra/src/org/droidparts/util/intent/IntentFactory.java
rename to droidparts/src/org/droidparts/util/intent/IntentFactory.java
diff --git a/extra/src/org/droidparts/util/intent/IntentHelper.java b/droidparts/src/org/droidparts/util/intent/IntentHelper.java
similarity index 100%
rename from extra/src/org/droidparts/util/intent/IntentHelper.java
rename to droidparts/src/org/droidparts/util/intent/IntentHelper.java
diff --git a/extra/src/org/droidparts/util/io/IOUtils.java b/droidparts/src/org/droidparts/util/io/IOUtils.java
similarity index 100%
rename from extra/src/org/droidparts/util/io/IOUtils.java
rename to droidparts/src/org/droidparts/util/io/IOUtils.java
diff --git a/extra/src/org/droidparts/util/net/ConnectivityUtils.java b/droidparts/src/org/droidparts/util/net/ConnectivityUtils.java
similarity index 100%
rename from extra/src/org/droidparts/util/net/ConnectivityUtils.java
rename to droidparts/src/org/droidparts/util/net/ConnectivityUtils.java
diff --git a/extra/src/org/droidparts/util/ui/AbstractDialogFactory.java b/droidparts/src/org/droidparts/util/ui/AbstractDialogFactory.java
similarity index 100%
rename from extra/src/org/droidparts/util/ui/AbstractDialogFactory.java
rename to droidparts/src/org/droidparts/util/ui/AbstractDialogFactory.java
diff --git a/extra/src/org/droidparts/util/ui/BitmapUtils.java b/droidparts/src/org/droidparts/util/ui/BitmapUtils.java
similarity index 100%
rename from extra/src/org/droidparts/util/ui/BitmapUtils.java
rename to droidparts/src/org/droidparts/util/ui/BitmapUtils.java
diff --git a/extra/src/org/droidparts/util/ui/EditTextValidator.java b/droidparts/src/org/droidparts/util/ui/EditTextValidator.java
similarity index 100%
rename from extra/src/org/droidparts/util/ui/EditTextValidator.java
rename to droidparts/src/org/droidparts/util/ui/EditTextValidator.java
diff --git a/extra/src/org/droidparts/util/ui/ImagePicker.java b/droidparts/src/org/droidparts/util/ui/ImagePicker.java
similarity index 98%
rename from extra/src/org/droidparts/util/ui/ImagePicker.java
rename to droidparts/src/org/droidparts/util/ui/ImagePicker.java
index e80f3b61..8ecadbc7 100644
--- a/extra/src/org/droidparts/util/ui/ImagePicker.java
+++ b/droidparts/src/org/droidparts/util/ui/ImagePicker.java
@@ -63,7 +63,7 @@ public void showDialog(boolean deleteOptionAvailable) {
dialog.show();
}
- public boolean onActivityResult(int requestCode, int resultCode, Intent data) {
+ public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
boolean handled = false;
Bitmap bm = null;
switch (requestCode) {
diff --git a/extra/src/org/droidparts/util/ui/ListViewSynchronizer.java b/droidparts/src/org/droidparts/util/ui/ListViewSynchronizer.java
similarity index 91%
rename from extra/src/org/droidparts/util/ui/ListViewSynchronizer.java
rename to droidparts/src/org/droidparts/util/ui/ListViewSynchronizer.java
index bd9a02d0..be2c9779 100644
--- a/extra/src/org/droidparts/util/ui/ListViewSynchronizer.java
+++ b/droidparts/src/org/droidparts/util/ui/ListViewSynchronizer.java
@@ -37,7 +37,7 @@ public ListViewSynchronizer(ListView first, ListView second) {
rightListView = second;
}
- public void init() {
+ public void synchronize() {
ListAdapter leftAdapter = leftListView.getAdapter();
ListAdapter rightAdapter = rightListView.getAdapter();
if (leftAdapter == null || rightAdapter == null) {
@@ -45,6 +45,9 @@ public void init() {
}
leftViewsHeights = new int[leftAdapter.getCount()];
rightViewsHeights = new int[rightAdapter.getCount()];
+ // reset getFirstVisiblePosition()
+ leftListView.setAdapter(leftAdapter);
+ rightListView.setAdapter(rightAdapter);
//
leftListView.setOnTouchListener(this);
rightListView.setOnTouchListener(this);
@@ -52,6 +55,13 @@ public void init() {
rightListView.setOnScrollListener(this);
}
+ public void desynchronize() {
+ leftListView.setOnTouchListener(null);
+ rightListView.setOnTouchListener(null);
+ leftListView.setOnScrollListener(null);
+ rightListView.setOnScrollListener(null);
+ }
+
/**
* Passing the touch event to the opposite list
*/
diff --git a/extra/src/org/droidparts/util/ui/ViewUtils.java b/droidparts/src/org/droidparts/util/ui/ViewUtils.java
similarity index 100%
rename from extra/src/org/droidparts/util/ui/ViewUtils.java
rename to droidparts/src/org/droidparts/util/ui/ViewUtils.java
diff --git a/extra/src/org/droidparts/widget/ClearableEditText.java b/droidparts/src/org/droidparts/widget/ClearableEditText.java
similarity index 80%
rename from extra/src/org/droidparts/widget/ClearableEditText.java
rename to droidparts/src/org/droidparts/widget/ClearableEditText.java
index 7e6f8a8f..7cd7d1ef 100644
--- a/extra/src/org/droidparts/widget/ClearableEditText.java
+++ b/droidparts/src/org/droidparts/widget/ClearableEditText.java
@@ -15,7 +15,7 @@
*/
package org.droidparts.widget;
-import static org.droidparts.util.Strings.isEmpty;
+import static org.droidparts.util.Strings.isNotEmpty;
import org.droidparts.adapter.ui.TextWatcherAdapter;
import org.droidparts.adapter.ui.TextWatcherAdapter.TextWatcherListener;
@@ -25,11 +25,12 @@
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
+import android.view.View.OnFocusChangeListener;
import android.view.View.OnTouchListener;
import android.widget.EditText;
public class ClearableEditText extends EditText implements OnTouchListener,
- TextWatcherListener {
+ OnFocusChangeListener, TextWatcherListener {
public interface Listener {
void didClearEditText();
@@ -65,8 +66,8 @@ public ClearableEditText(Context context, AttributeSet attrs, int defStyle) {
private void init() {
setClearDrawable(android.R.drawable.presence_offline);
super.setOnTouchListener(this);
+ super.setOnFocusChangeListener(this);
addTextChangedListener(new TextWatcherAdapter(this, this));
- onTextChanged(this, getText().toString());
}
@Override
@@ -74,7 +75,13 @@ public void setOnTouchListener(OnTouchListener l) {
this.l = l;
}
+ @Override
+ public void setOnFocusChangeListener(OnFocusChangeListener f) {
+ this.f = f;
+ }
+
private OnTouchListener l;
+ private OnFocusChangeListener f;
@Override
public boolean onTouch(View v, MotionEvent event) {
@@ -97,11 +104,26 @@ public boolean onTouch(View v, MotionEvent event) {
return false;
}
+ @Override
+ public void onFocusChange(View v, boolean hasFocus) {
+ if (hasFocus) {
+ setClearShown(isNotEmpty(getText()));
+ } else {
+ setClearShown(false);
+ }
+ if (f != null) {
+ f.onFocusChange(v, hasFocus);
+ }
+ }
+
@Override
public void onTextChanged(EditText view, String text) {
- Drawable x = isEmpty(text) ? null : xD;
+ setClearShown(isNotEmpty(text));
+ }
+
+ private void setClearShown(boolean shown) {
+ Drawable x = shown ? xD : null;
setCompoundDrawables(getCompoundDrawables()[0],
getCompoundDrawables()[1], x, getCompoundDrawables()[3]);
}
-
}
diff --git a/extra/src/org/droidparts/widget/MultiSelectListPreference.java b/droidparts/src/org/droidparts/widget/MultiSelectListPreference.java
similarity index 100%
rename from extra/src/org/droidparts/widget/MultiSelectListPreference.java
rename to droidparts/src/org/droidparts/widget/MultiSelectListPreference.java
diff --git a/extra/src/org/droidparts/widget/VerticalScrollView.java b/droidparts/src/org/droidparts/widget/VerticalScrollView.java
similarity index 100%
rename from extra/src/org/droidparts/widget/VerticalScrollView.java
rename to droidparts/src/org/droidparts/widget/VerticalScrollView.java
diff --git a/extra/.project b/extra/.project
deleted file mode 100644
index 087b6a31..00000000
--- a/extra/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- droidparts-extra
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/extra/.settings/org.eclipse.jdt.core.prefs b/extra/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 48ab4c6b..00000000
--- a/extra/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/extra/build.xml b/extra/build.xml
deleted file mode 100644
index c6acf98e..00000000
--- a/extra/build.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/extra/pom.xml b/extra/pom.xml
deleted file mode 100644
index d069d26b..00000000
--- a/extra/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
- 4.0.0
-
-
- org.droidparts
- droidparts-parent
- 1.0-SNAPSHOT
-
-
- extra
- droidparts-extra
- DroidParts Extra
- apklib
-
-
-
- android
- android
- 2.2_r3
- provided
-
-
- org.droidparts
- base
- ${version}
-
-
-
-
- src
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 1.5
- -proc:none
-
-
-
- com.jayway.maven.plugins.android.generation2
- android-maven-plugin
- true
- true
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/extra/project.properties b/extra/project.properties
deleted file mode 100644
index b679862c..00000000
--- a/extra/project.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-android.library=true
-
-target=android-8
-
-android.library.reference.1=../base
diff --git a/extra/res/values/vals.xml b/extra/res/values/vals.xml
deleted file mode 100644
index e86b2f33..00000000
--- a/extra/res/values/vals.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/fragments/.project b/fragments/.project
deleted file mode 100644
index e9a96ebe..00000000
--- a/fragments/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
- droidparts-fragments
-
-
-
-
-
- com.android.ide.eclipse.adt.ResourceManagerBuilder
-
-
-
-
- com.android.ide.eclipse.adt.PreCompilerBuilder
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- com.android.ide.eclipse.adt.ApkBuilder
-
-
-
-
-
- com.android.ide.eclipse.adt.AndroidNature
- org.eclipse.jdt.core.javanature
-
-
diff --git a/fragments/.settings/org.eclipse.jdt.core.prefs b/fragments/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 48ab4c6b..00000000
--- a/fragments/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
-org.eclipse.jdt.core.compiler.compliance=1.6
-org.eclipse.jdt.core.compiler.source=1.6
diff --git a/fragments/AndroidManifest.xml b/fragments/AndroidManifest.xml
deleted file mode 100644
index 31227bc5..00000000
--- a/fragments/AndroidManifest.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/fragments/build.xml b/fragments/build.xml
deleted file mode 100644
index 7a2cbbc4..00000000
--- a/fragments/build.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/fragments/pom.xml b/fragments/pom.xml
deleted file mode 100644
index b1dc6df8..00000000
--- a/fragments/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
- 4.0.0
-
-
- org.droidparts
- droidparts-parent
- 1.0-SNAPSHOT
-
-
- fragments
- droidparts-fragments
- DroidParts Fragments
- apklib
-
-
-
- android
- android
- 4.0_r3
- provided
-
-
- org.droidparts
- base
- ${version}
-
-
- org.droidparts
- extra
- ${version}
-
-
-
-
- src
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
-
-
- 1.5
- -proc:none
-
-
-
- com.jayway.maven.plugins.android.generation2
- android-maven-plugin
- true
- true
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/fragments/project.properties b/fragments/project.properties
deleted file mode 100644
index 101c7c2a..00000000
--- a/fragments/project.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-android.library=true
-
-target=android-14
-
-android.library.reference.1=../base
-android.library.reference.2=../extra
-android.library.reference.3=../../ActionBarSherlock/library
diff --git a/fragments/res/values/vals.xml b/fragments/res/values/vals.xml
deleted file mode 100644
index e86b2f33..00000000
--- a/fragments/res/values/vals.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
\ No newline at end of file
diff --git a/fragments/src-stub/README b/fragments/src-stub/README
deleted file mode 100644
index 71d424e9..00000000
--- a/fragments/src-stub/README
+++ /dev/null
@@ -1 +0,0 @@
-These stub classes are only required if AcitonBarSherlock & android-support-v4.jar are not available at compile time.
\ No newline at end of file
diff --git a/fragments/src-stub/android/support/v4/app/DialogFragment.java b/fragments/src-stub/android/support/v4/app/DialogFragment.java
deleted file mode 100644
index e8c4fb8e..00000000
--- a/fragments/src-stub/android/support/v4/app/DialogFragment.java
+++ /dev/null
@@ -1 +0,0 @@
-package android.support.v4.app;
public class DialogFragment extends Fragment {
}
\ No newline at end of file
diff --git a/fragments/src-stub/android/support/v4/app/Fragment.java b/fragments/src-stub/android/support/v4/app/Fragment.java
deleted file mode 100644
index c6efad52..00000000
--- a/fragments/src-stub/android/support/v4/app/Fragment.java
+++ /dev/null
@@ -1 +0,0 @@
-package android.support.v4.app;
import org.droidparts.Stub;
import android.app.Dialog;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
public class Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
throw new Stub();
}
public Dialog getDialog() {
throw new Stub();
}
public FragmentManager getFragmentManager() {
throw new Stub();
}
public void show(FragmentTransaction ft, String tag) {
throw new Stub();
}
public FragmentActivity getActivity() {
throw new Stub();
}
public Bundle getArguments() {
throw new Stub();
}
}
\ No newline at end of file
diff --git a/fragments/src-stub/android/support/v4/app/FragmentActivity.java b/fragments/src-stub/android/support/v4/app/FragmentActivity.java
deleted file mode 100644
index 9a366183..00000000
--- a/fragments/src-stub/android/support/v4/app/FragmentActivity.java
+++ /dev/null
@@ -1 +0,0 @@
-package android.support.v4.app;
import org.droidparts.Stub;
import android.app.Activity;
import android.os.Bundle;
public class FragmentActivity extends Activity {
protected void onCreate(Bundle savedInstanceState) {
throw new Stub();
}
public FragmentManager getSupportFragmentManager() {
throw new Stub();
}
}
\ No newline at end of file
diff --git a/fragments/src-stub/android/support/v4/app/FragmentManager.java b/fragments/src-stub/android/support/v4/app/FragmentManager.java
deleted file mode 100644
index e38e110c..00000000
--- a/fragments/src-stub/android/support/v4/app/FragmentManager.java
+++ /dev/null
@@ -1 +0,0 @@
-package android.support.v4.app;
import org.droidparts.Stub;
public class FragmentManager {
public Fragment findFragmentById(int id) {
throw new Stub();
}
public Fragment findFragmentByTag(String tag) {
throw new Stub();
}
public FragmentTransaction beginTransaction() {
throw new Stub();
}
}
\ No newline at end of file
diff --git a/fragments/src-stub/android/support/v4/app/FragmentTransaction.java b/fragments/src-stub/android/support/v4/app/FragmentTransaction.java
deleted file mode 100644
index 504a1830..00000000
--- a/fragments/src-stub/android/support/v4/app/FragmentTransaction.java
+++ /dev/null
@@ -1 +0,0 @@
-package android.support.v4.app;
import org.droidparts.Stub;
public class FragmentTransaction {
public void add(int fragmentId, Fragment fragment) {
throw new Stub();
}
public void show(Fragment f) {
throw new Stub();
}
public void hide(Fragment f) {
throw new Stub();
}
public void remove(Fragment f) {
throw new Stub();
}
public void commit() {
throw new Stub();
}
public void setCustomAnimations(int enterAnimation, int exitAnimation) {
throw new Stub();
}
}
\ No newline at end of file
diff --git a/fragments/src-stub/android/support/v4/app/ListFragment.java b/fragments/src-stub/android/support/v4/app/ListFragment.java
deleted file mode 100644
index a178d6ec..00000000
--- a/fragments/src-stub/android/support/v4/app/ListFragment.java
+++ /dev/null
@@ -1 +0,0 @@
-package android.support.v4.app;
public class ListFragment extends Fragment {
}
\ No newline at end of file
diff --git a/fragments/src-stub/android/support/v4/util/LruCache.java b/fragments/src-stub/android/support/v4/util/LruCache.java
deleted file mode 100644
index b781cf33..00000000
--- a/fragments/src-stub/android/support/v4/util/LruCache.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package android.support.v4.util;
-
-import org.droidparts.Stub;
-
-import android.graphics.Bitmap;
-
-public class LruCache {
-
- public LruCache(int i) {
- throw new Stub();
- }
-
- public Bitmap put(String key, Bitmap value) {
- throw new Stub();
- }
-
- public Bitmap get(String key) {
- throw new Stub();
- }
-
- public Bitmap remove(String key) {
- throw new Stub();
- }
-
- public void evictAll() {
- throw new Stub();
- }
-
-}
diff --git a/fragments/src-stub/com/actionbarsherlock/app/ActionBar.java b/fragments/src-stub/com/actionbarsherlock/app/ActionBar.java
deleted file mode 100644
index 3d601649..00000000
--- a/fragments/src-stub/com/actionbarsherlock/app/ActionBar.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.actionbarsherlock.app;
import org.droidparts.Stub;
import android.support.v4.app.FragmentTransaction;
public class ActionBar {
public static final int NAVIGATION_MODE_TABS = android.app.ActionBar.NAVIGATION_MODE_TABS;
public static class Tab {
public void setTabListener(TabListener tabListener) {
throw new Stub();
}
public int getPosition() {
throw new Stub();
}
}
public static interface TabListener {
public void onTabSelected(Tab tab, FragmentTransaction ft);
public void onTabUnselected(Tab tab, FragmentTransaction ft);
public void onTabReselected(Tab tab, FragmentTransaction ft);
}
public void setNavigationMode(int mode) {
throw new Stub();
}
public void addTab(Tab tab, int position) {
throw new Stub();
}
public void setSelectedNavigationItem(int position) {
throw new Stub();
}
public Tab getSelectedTab() {
throw new Stub();
}
}
\ No newline at end of file
diff --git a/fragments/src-stub/com/actionbarsherlock/app/SherlockDialogFragment.java b/fragments/src-stub/com/actionbarsherlock/app/SherlockDialogFragment.java
deleted file mode 100644
index fdf9f052..00000000
--- a/fragments/src-stub/com/actionbarsherlock/app/SherlockDialogFragment.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.actionbarsherlock.app;
import android.support.v4.app.DialogFragment;
public class SherlockDialogFragment extends DialogFragment {
}
\ No newline at end of file
diff --git a/fragments/src-stub/com/actionbarsherlock/app/SherlockFragment.java b/fragments/src-stub/com/actionbarsherlock/app/SherlockFragment.java
deleted file mode 100644
index 81e19807..00000000
--- a/fragments/src-stub/com/actionbarsherlock/app/SherlockFragment.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.actionbarsherlock.app;
import android.support.v4.app.Fragment;
public class SherlockFragment extends Fragment {
}
\ No newline at end of file
diff --git a/fragments/src-stub/com/actionbarsherlock/app/SherlockFragmentActivity.java b/fragments/src-stub/com/actionbarsherlock/app/SherlockFragmentActivity.java
deleted file mode 100644
index 8c051c00..00000000
--- a/fragments/src-stub/com/actionbarsherlock/app/SherlockFragmentActivity.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.actionbarsherlock.app;
import org.droidparts.Stub;
import android.support.v4.app.FragmentActivity;
public class SherlockFragmentActivity extends FragmentActivity {
public void setSupportProgressBarIndeterminateVisibility(boolean visible) {
throw new Stub();
}
public ActionBar getSupportActionBar() {
throw new Stub();
}
}
\ No newline at end of file
diff --git a/fragments/src-stub/com/actionbarsherlock/app/SherlockListFragment.java b/fragments/src-stub/com/actionbarsherlock/app/SherlockListFragment.java
deleted file mode 100644
index c6819506..00000000
--- a/fragments/src-stub/com/actionbarsherlock/app/SherlockListFragment.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.actionbarsherlock.app;
import android.support.v4.app.ListFragment;
public class SherlockListFragment extends ListFragment {
}
\ No newline at end of file
diff --git a/fragments/src-stub/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/fragments/src-stub/com/actionbarsherlock/app/SherlockPreferenceActivity.java
deleted file mode 100644
index f4b7233c..00000000
--- a/fragments/src-stub/com/actionbarsherlock/app/SherlockPreferenceActivity.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.actionbarsherlock.app;
import android.preference.PreferenceActivity;
public class SherlockPreferenceActivity extends PreferenceActivity {
}
\ No newline at end of file
diff --git a/fragments/src-stub/com/actionbarsherlock/view/MenuItem.java b/fragments/src-stub/com/actionbarsherlock/view/MenuItem.java
deleted file mode 100644
index 2cfd79f3..00000000
--- a/fragments/src-stub/com/actionbarsherlock/view/MenuItem.java
+++ /dev/null
@@ -1 +0,0 @@
-package com.actionbarsherlock.view;
import org.droidparts.Stub;
import android.view.View;
public class MenuItem {
public void setActionView(View v) {
throw new Stub();
}
}
\ No newline at end of file
diff --git a/fragments/src-stub/org/droidparts/Stub.java b/fragments/src-stub/org/droidparts/Stub.java
deleted file mode 100644
index 6a71b016..00000000
--- a/fragments/src-stub/org/droidparts/Stub.java
+++ /dev/null
@@ -1 +0,0 @@
-package org.droidparts;
public class Stub extends RuntimeException {
private static final long serialVersionUID = 1L;
public Stub() {
super("Stub implementation, real library required at runtime.");
}
}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index d74a074d..674d7c93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,150 +1,151 @@
-
- 4.0.0
+
+ 4.0.0
-
- org.sonatype.oss
- oss-parent
- 7
-
+
+ org.sonatype.oss
+ oss-parent
+ 7
+
- org.droidparts
- parent
- 1.0-SNAPSHOT
- pom
+ org.droidparts
+ parent
+ 1.0-SNAPSHOT
+ pom
- DroidParts (Parent)
- A carefully crafted Android framework.
- http://droidparts.org
- 2011
-
-
- base
- extra
- fragments
-
-
-
- scm:git:git@github.com:yanchenko/droidparts.git
- scm:git:git@github.com:yanchenko/droidparts.git
- https://github.com/yanchenko/droidparts
-
-
-
-
- yanchenko
- Alex Yanchenko
- alex@yanchenko.com
- 2
-
- developer
-
-
-
+ DroidParts (Parent)
+ A carefully crafted Android framework.
+ http://droidparts.org
+ 2011
-
-
- Apache 2
- http://www.apache.org/licenses/LICENSE-2.0.txt
- repo
-
-
+
+ droidparts
+
-
- UTF-8
-
+
+ scm:git:git@github.com:yanchenko/droidparts.git
+
+ scm:git:git@github.com:yanchenko/droidparts.git
+
+ https://github.com/yanchenko/droidparts
+
-
-
-
- com.sun.codemodel
- codemodel
- 2.4.1
-
-
- junit
- junit
- 4.8.1
- test
-
-
-
+
+
+ yanchenko
+ Alex Yanchenko
+ alex@yanchenko.com
+ 2
+
+ developer
+
+
+
-
-
-
-
- org.apache.maven.plugins
- maven-release-plugin
- 2.2.1
-
- forked-path
-
-
-
- org.sonatype.plugins
- jarjar-maven-plugin
- 1.3
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 2.3.2
-
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.3.1
-
-
- maven-assembly-plugin
- 2.2.1
-
-
- maven-javadoc-plugin
- 2.7
-
-
- maven-source-plugin
- 2.1.2
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
- 2.7
-
-
-
-
+
+
+ Apache 2
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
-
-
- release-sign-artifacts
-
-
- performRelease
- true
-
-
-
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.4
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
-
-
-
+
+ UTF-8
+
+
+
+
+
+ com.sun.codemodel
+ codemodel
+ 2.4.1
+
+
+ junit
+ junit
+ 4.8.1
+ test
+
+
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-release-plugin
+ 2.2.1
+
+ forked-path
+
+
+
+ org.sonatype.plugins
+ jarjar-maven-plugin
+ 1.3
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 2.3.2
+
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 2.3.1
+
+
+ maven-assembly-plugin
+ 2.2.1
+
+
+ maven-javadoc-plugin
+ 2.7
+
+
+ maven-source-plugin
+ 2.1.2
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ 2.7
+
+
+
+
+
+
+
+ release-sign-artifacts
+
+
+ performRelease
+ true
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.4
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sample/DroidPartsGram/project.properties b/sample/DroidPartsGram/project.properties
deleted file mode 100644
index 0c82f2af..00000000
--- a/sample/DroidPartsGram/project.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# Project target.
-target=android-16
-
-android.library.reference.1=../../../ActionBarSherlock/library
-android.library.reference.2=../../base
-android.library.reference.3=../../extra
-android.library.reference.4=../../fragments
-
-proguard.config=${sdk.dir}/tools/proguard/proguard-android-optimize.txt:../../proguard-droidparts.cfg
\ No newline at end of file
diff --git a/sample/droidparts-sample/.classpath b/sample/droidparts-sample/.classpath
deleted file mode 100644
index a4763d1e..00000000
--- a/sample/droidparts-sample/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/sample/droidparts-sample/.settings/org.eclipse.core.resources.prefs b/sample/droidparts-sample/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c02..00000000
--- a/sample/droidparts-sample/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/sample/droidparts-sample/.settings/org.eclipse.core.runtime.prefs b/sample/droidparts-sample/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d..00000000
--- a/sample/droidparts-sample/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/sample/droidparts-sample/.settings/org.eclipse.jdt.ui.prefs b/sample/droidparts-sample/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 9df54cf3..00000000
--- a/sample/droidparts-sample/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,56 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=/**\r\n * @return the ${bare_field_name}\r\n *//**\r\n * @param ${param} the ${bare_field_name} to set\r\n *//**\r\n * ${tags}\r\n *//**\r\n * Copyright 2013 Alex Yanchenko\r\n * \r\n * Licensed under the Apache License, Version 2.0 (the "License");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n * \r\n * http\://www.apache.org/licenses/LICENSE-2.0\r\n * \r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License. \r\n *//**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * ${tags}\r\n *//* (non-Javadoc)\r\n * ${see_to_overridden}\r\n *//**\r\n * ${tags}\r\n * ${see_to_target}\r\n */${filecomment}\r\n${package_declaration}\r\n\r\n${type_declaration}\r\n\r\n\r\n\r\n// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();// ${todo} Auto-generated method stub\r\n${body_statement}${body_statement}\r\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/test/.classpath b/test/.classpath
deleted file mode 100644
index a4763d1e..00000000
--- a/test/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/test/.settings/org.eclipse.core.resources.prefs b/test/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c02..00000000
--- a/test/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/=UTF-8
diff --git a/test/.settings/org.eclipse.core.runtime.prefs b/test/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22d..00000000
--- a/test/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/test/.settings/org.eclipse.jdt.ui.prefs b/test/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 9df54cf3..00000000
--- a/test/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,56 +0,0 @@
-eclipse.preferences.version=1
-editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
-org.eclipse.jdt.ui.javadoc=true
-org.eclipse.jdt.ui.text.custom_code_templates=/**\r\n * @return the ${bare_field_name}\r\n *//**\r\n * @param ${param} the ${bare_field_name} to set\r\n *//**\r\n * ${tags}\r\n *//**\r\n * Copyright 2013 Alex Yanchenko\r\n * \r\n * Licensed under the Apache License, Version 2.0 (the "License");\r\n * you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n * \r\n * http\://www.apache.org/licenses/LICENSE-2.0\r\n * \r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an "AS IS" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License. \r\n *//**\r\n * @author ${user}\r\n *\r\n * ${tags}\r\n *//**\r\n * \r\n *//**\r\n * ${tags}\r\n *//* (non-Javadoc)\r\n * ${see_to_overridden}\r\n *//**\r\n * ${tags}\r\n * ${see_to_target}\r\n */${filecomment}\r\n${package_declaration}\r\n\r\n${type_declaration}\r\n\r\n\r\n\r\n// ${todo} Auto-generated catch block\r\n${exception_var}.printStackTrace();// ${todo} Auto-generated method stub\r\n${body_statement}${body_statement}\r\n// ${todo} Auto-generated constructor stubreturn ${field};${field} \= ${param};
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-sp_cleanup.add_missing_deprecated_annotations=true
-sp_cleanup.add_missing_methods=false
-sp_cleanup.add_missing_nls_tags=false
-sp_cleanup.add_missing_override_annotations=true
-sp_cleanup.add_missing_override_annotations_interface_methods=true
-sp_cleanup.add_serial_version_id=false
-sp_cleanup.always_use_blocks=true
-sp_cleanup.always_use_parentheses_in_expressions=false
-sp_cleanup.always_use_this_for_non_static_field_access=false
-sp_cleanup.always_use_this_for_non_static_method_access=false
-sp_cleanup.convert_to_enhanced_for_loop=false
-sp_cleanup.correct_indentation=false
-sp_cleanup.format_source_code=true
-sp_cleanup.format_source_code_changes_only=false
-sp_cleanup.make_local_variable_final=false
-sp_cleanup.make_parameters_final=false
-sp_cleanup.make_private_fields_final=true
-sp_cleanup.make_type_abstract_if_missing_method=false
-sp_cleanup.make_variable_declarations_final=true
-sp_cleanup.never_use_blocks=false
-sp_cleanup.never_use_parentheses_in_expressions=true
-sp_cleanup.on_save_use_additional_actions=false
-sp_cleanup.organize_imports=true
-sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-sp_cleanup.qualify_static_member_accesses_with_declaring_class=false
-sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
-sp_cleanup.remove_private_constructors=true
-sp_cleanup.remove_trailing_whitespaces=false
-sp_cleanup.remove_trailing_whitespaces_all=true
-sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
-sp_cleanup.remove_unnecessary_casts=true
-sp_cleanup.remove_unnecessary_nls_tags=false
-sp_cleanup.remove_unused_imports=false
-sp_cleanup.remove_unused_local_variables=false
-sp_cleanup.remove_unused_private_fields=true
-sp_cleanup.remove_unused_private_members=false
-sp_cleanup.remove_unused_private_methods=true
-sp_cleanup.remove_unused_private_types=true
-sp_cleanup.sort_members=false
-sp_cleanup.sort_members_all=false
-sp_cleanup.use_blocks=false
-sp_cleanup.use_blocks_only_for_return_and_throw=false
-sp_cleanup.use_parentheses_in_expressions=false
-sp_cleanup.use_this_for_non_static_field_access=false
-sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-sp_cleanup.use_this_for_non_static_method_access=false
-sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
diff --git a/test/project.properties b/test/project.properties
deleted file mode 100644
index 764a7435..00000000
--- a/test/project.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Project target.
-target=android-14
-
-android.library.reference.1=../base
-android.library.reference.2=../extra
\ No newline at end of file