[Change] Change package and some calls.

jingle1267 · jingle1267 · commit 07ace5c129c2 · 2014-09-14T12:51:34.000+08:00
diff --git a/src/com/worthed/activity/BitmapActivity.java b/src/com/worthed/activity/BitmapActivity.java
@@ -16,7 +16,7 @@
 package com.worthed.activity;
 
 import com.worthed.R;
-import com.worthed.utils.BitmapUtil;
+import com.worthed.util.BitmapUtil;
 
 import android.app.Activity;
 import android.graphics.Bitmap;
@@ -34,7 +34,6 @@ public class BitmapActivity extends Activity {
 	private final String TAG = BitmapActivity.class.getSimpleName(); 
 	
 	private ImageView imageViewOrigin, imageViewCombine;
-	private BitmapUtil bitmapUtil;
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -43,28 +42,27 @@ protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.bitmap_layout);
 		imageViewOrigin = (ImageView) findViewById(R.id.iv_round_origin);
 		imageViewCombine = (ImageView) findViewById(R.id.iv_round_combine);
-		bitmapUtil = new BitmapUtil();
 		testProcess();
 		testCombine();
 	}
 
 	private void testProcess() {
 		Bitmap bitmap = BitmapFactory.decodeResource(getResources(),
 				R.drawable.beautiful);
-		imageViewOrigin.setImageBitmap(bitmapUtil.toRoundBitmap(bitmap));
+		imageViewOrigin.setImageBitmap(BitmapUtil.getRoundBitmap(bitmap));
 		bitmap.recycle();
 	}
 
 	private void testCombine() {
-		Bitmap bitmap = bitmapUtil.toRoundBitmap(BitmapFactory.decodeResource(getResources(),
+		Bitmap bitmap = BitmapUtil.getRoundBitmap(BitmapFactory.decodeResource(getResources(),
 				R.drawable.beautiful));
 		Bitmap mask = BitmapFactory.decodeResource(getResources(),
 				R.drawable.sea);
 		
 		Log.d(TAG, "foreground width - height : " + bitmap.getWidth() + " - " + bitmap.getHeight());
 		Log.d(TAG, "background width - height : " + mask.getWidth() + " - " + mask.getHeight());
 		
-		imageViewCombine.setImageBitmap(bitmapUtil.combineImagesToSameSize(mask, bitmap));
+		imageViewCombine.setImageBitmap(BitmapUtil.combineImagesToSameSize(mask, bitmap));
 		bitmap.recycle();
 		mask.recycle();
 	}
diff --git a/src/com/worthed/app/BaseCrashHandler.java b/src/com/worthed/app/BaseCrashHandler.java
@@ -20,7 +20,7 @@
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.Date;
 
-import com.worthed.utils.LogUtils;
+import com.worthed.util.LogUtils;
 
 import android.content.Context;
 import android.os.Environment;
diff --git a/src/com/worthed/util/AppUtils.java b/src/com/worthed/util/AppUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.File;
 
diff --git a/src/com/worthed/util/AssetDatabaseOpenHelper.java b/src/com/worthed/util/AssetDatabaseOpenHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/com/worthed/util/BitmapUtil.java b/src/com/worthed/util/BitmapUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/src/com/worthed/util/CipherUtils.java b/src/com/worthed/util/CipherUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.UnsupportedEncodingException;
 import java.security.Key;
diff --git a/src/com/worthed/util/CommonUtil.java b/src/com/worthed/util/CommonUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 
 import android.content.Context;
diff --git a/src/com/worthed/util/DataCleanManager.java b/src/com/worthed/util/DataCleanManager.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.File;
 import android.content.Context;
diff --git a/src/com/worthed/util/DatabaseExportUtils.java b/src/com/worthed/util/DatabaseExportUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import android.content.Context;
 import android.os.Environment;
diff --git a/src/com/worthed/util/DateUtils.java b/src/com/worthed/util/DateUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
diff --git a/src/com/worthed/util/DigestUtils.java b/src/com/worthed/util/DigestUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.security.MessageDigest;
 
diff --git a/src/com/worthed/util/DisplayUtils.java b/src/com/worthed/util/DisplayUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/src/com/worthed/util/DoubleKeyValueMap.java b/src/com/worthed/util/DoubleKeyValueMap.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/com/worthed/util/DownloadManagerPro.java b/src/com/worthed/util/DownloadManagerPro.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.lang.reflect.Method;
 
diff --git a/src/com/worthed/util/FileUtils.java b/src/com/worthed/util/FileUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;
diff --git a/src/com/worthed/util/HanziToPinyin.java b/src/com/worthed/util/HanziToPinyin.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import android.text.TextUtils;
 import android.util.Log;
diff --git a/src/com/worthed/util/ImsiUtil.java b/src/com/worthed/util/ImsiUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
diff --git a/src/com/worthed/util/LocationUtils.java b/src/com/worthed/util/LocationUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.InputStream;
 
diff --git a/src/com/worthed/util/LogUtils.java b/src/com/worthed/util/LogUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import android.util.Log;
 
diff --git a/src/com/worthed/util/NetUtil.java b/src/com/worthed/util/NetUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/com/worthed/util/PackageUtils.java b/src/com/worthed/util/PackageUtils.java
@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.File;
 import java.util.List;
 
-import com.worthed.utils.ShellUtils.CommandResult;
+import com.worthed.util.ShellUtils.CommandResult;
 
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
diff --git a/src/com/worthed/util/PhoneUtil.java b/src/com/worthed/util/PhoneUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import android.content.Context;
 import android.content.Intent;
diff --git a/src/com/worthed/util/PreferencesCookieStore.java b/src/com/worthed/util/PreferencesCookieStore.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/src/com/worthed/util/RandomUtils.java b/src/com/worthed/util/RandomUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.util.Random;
 
diff --git a/src/com/worthed/util/RegUtils.java b/src/com/worthed/util/RegUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
diff --git a/src/com/worthed/util/ResourceUtils.java b/src/com/worthed/util/ResourceUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/com/worthed/util/SettingUtils.java b/src/com/worthed/util/SettingUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
diff --git a/src/com/worthed/util/ShellUtils.java b/src/com/worthed/util/ShellUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
diff --git a/src/com/worthed/util/ShortCutUtils.java b/src/com/worthed/util/ShortCutUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import com.worthed.R;
 
diff --git a/src/com/worthed/util/Singleton.java b/src/com/worthed/util/Singleton.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 /**
  * Singleton helper class for lazily initialization.
diff --git a/src/com/worthed/util/StringUtils.java b/src/com/worthed/util/StringUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.util.Locale;
 import java.util.regex.Pattern;
diff --git a/src/com/worthed/util/ViewUtils.java b/src/com/worthed/util/ViewUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.worthed.utils;
+package com.worthed.util;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
