[SCM] Multi-format 1D/2D barcode image processing library branch, upstream, updated. 3b22568664b0c0017ea793fd3cf5fde433e95717

[srowen]

The following commit has been merged in the upstream branch:
commit 3b22568664b0c0017ea793fd3cf5fde433e95717
Author: srowen <srowen at 59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date:   Sat Apr 3 23:59:34 2010 +0000

    Small thing, make log TAGs consistent
    
    git-svn-id: http://zxing.googlecode.com/svn/trunk@1275 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/src/com/google/zxing/client/android/CameraManager.java b/android/src/com/google/zxing/client/android/CameraManager.java
index 3643ac4..33250da 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 af49e41..18b466d 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 b63fc21..dce7d14 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 e861788..46628e2 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 d10d4d0..33beae7 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 9376989..dfc1e5a 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("&lt;");

-- 
Multi-format 1D/2D barcode image processing library