From 0413ee8d0b7fe97ebf33c6dbbf3aff8bf3a3509b Mon Sep 17 00:00:00 2001 From: srowen Date: Sat, 3 Apr 2010 23:59:34 +0000 Subject: [PATCH] Small thing, make log TAGs consistent git-svn-id: https://zxing.googlecode.com/svn/trunk@1275 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- android/src/com/google/zxing/client/android/CameraManager.java | 2 +- .../src/com/google/zxing/client/android/CaptureActivity.java | 3 ++- android/src/com/google/zxing/client/android/DecodeThread.java | 3 ++- .../src/com/google/zxing/client/android/FlashlightManager.java | 2 +- android/src/com/google/zxing/client/android/HelpActivity.java | 2 +- .../zxing/client/android/book/SearchBookContentsActivity.java | 3 ++- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/android/src/com/google/zxing/client/android/CameraManager.java b/android/src/com/google/zxing/client/android/CameraManager.java index 3643ac442..33250da6b 100755 --- a/android/src/com/google/zxing/client/android/CameraManager.java +++ b/android/src/com/google/zxing/client/android/CameraManager.java @@ -45,7 +45,7 @@ import java.util.regex.Pattern; */ final class CameraManager { - private static final String TAG = "CameraManager"; + private static final String TAG = CameraManager.class.getSimpleName(); private static final int MIN_FRAME_WIDTH = 240; private static final int MIN_FRAME_HEIGHT = 240; diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java index af49e411a..18b466ddb 100755 --- a/android/src/com/google/zxing/client/android/CaptureActivity.java +++ b/android/src/com/google/zxing/client/android/CaptureActivity.java @@ -78,7 +78,8 @@ import java.util.regex.Pattern; */ public final class CaptureActivity extends Activity implements SurfaceHolder.Callback { - private static final String TAG = "CaptureActivity"; + private static final String TAG = CaptureActivity.class.getSimpleName(); + private static final Pattern COMMA_PATTERN = Pattern.compile(","); private static final int SHARE_ID = Menu.FIRST; diff --git a/android/src/com/google/zxing/client/android/DecodeThread.java b/android/src/com/google/zxing/client/android/DecodeThread.java index b63fc2190..dce7d14cb 100755 --- a/android/src/com/google/zxing/client/android/DecodeThread.java +++ b/android/src/com/google/zxing/client/android/DecodeThread.java @@ -43,8 +43,9 @@ import java.util.Vector; */ final class DecodeThread extends Thread { + private static final String TAG = DecodeThread.class.getSimpleName(); + public static final String BARCODE_BITMAP = "barcode_bitmap"; - private static final String TAG = "DecodeThread"; private Handler handler; private final CaptureActivity activity; diff --git a/android/src/com/google/zxing/client/android/FlashlightManager.java b/android/src/com/google/zxing/client/android/FlashlightManager.java index e86178892..46628e25f 100644 --- a/android/src/com/google/zxing/client/android/FlashlightManager.java +++ b/android/src/com/google/zxing/client/android/FlashlightManager.java @@ -35,7 +35,7 @@ import java.lang.reflect.Method; */ final class FlashlightManager { - private static final String TAG = FlashlightManager.class.getName(); + private static final String TAG = FlashlightManager.class.getSimpleName(); private static Object iHardwareService; private static Method setFlashEnabledMethod; diff --git a/android/src/com/google/zxing/client/android/HelpActivity.java b/android/src/com/google/zxing/client/android/HelpActivity.java index d10d4d002..33beae74c 100644 --- a/android/src/com/google/zxing/client/android/HelpActivity.java +++ b/android/src/com/google/zxing/client/android/HelpActivity.java @@ -37,7 +37,7 @@ import android.widget.Button; */ public final class HelpActivity extends Activity { - private static final String TAG = HelpActivity.class.getName(); + private static final String TAG = HelpActivity.class.getSimpleName(); private static final String[] BUGGY_MODEL_SUBSTRINGS = {"Behold II", "Pulse", "Geeksphone"}; private static final Uri BUGGY_URI = diff --git a/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java b/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java index 9376989ce..dfc1e5a7b 100644 --- a/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java +++ b/android/src/com/google/zxing/client/android/book/SearchBookContentsActivity.java @@ -60,7 +60,8 @@ import com.google.zxing.client.android.AndroidHttpClient; */ public final class SearchBookContentsActivity extends Activity { - private static final String TAG = "SearchBookContents"; + private static final String TAG = SearchBookContentsActivity.class.getSimpleName(); + private static final String USER_AGENT = "ZXing (Android)"; private static final Pattern TAG_PATTERN = Pattern.compile("\\<.*?\\>"); private static final Pattern LT_ENTITY_PATTERN = Pattern.compile("<");