diff --git a/android-integration/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java b/android-integration/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java index 040b20600..d5628e872 100644 --- a/android-integration/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java +++ b/android-integration/src/main/java/com/google/zxing/integration/android/IntentIntegrator.java @@ -308,7 +308,7 @@ public class IntentIntegrator { } intentScan.putExtra("SCAN_FORMATS", joinedByComma.toString()); } - + // check requested camera ID if (cameraId >= 0) { intentScan.putExtra("SCAN_CAMERA_ID", cameraId); diff --git a/android/src/com/google/zxing/client/android/CaptureActivity.java b/android/src/com/google/zxing/client/android/CaptureActivity.java index d5a04b146..43c903862 100755 --- a/android/src/com/google/zxing/client/android/CaptureActivity.java +++ b/android/src/com/google/zxing/client/android/CaptureActivity.java @@ -218,7 +218,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal cameraManager.setManualFramingRect(width, height); } } - + if (intent.hasExtra(Intents.Scan.CAMERA_ID)) { int cameraId = intent.getIntExtra(Intents.Scan.CAMERA_ID, -1); if (cameraId >= 0) { diff --git a/android/src/com/google/zxing/client/android/Intents.java b/android/src/com/google/zxing/client/android/Intents.java index 4c8f5e613..6e59e8082 100755 --- a/android/src/com/google/zxing/client/android/Intents.java +++ b/android/src/com/google/zxing/client/android/Intents.java @@ -80,7 +80,7 @@ public final class Intents { * Example: "EAN_13,EAN_8,QR_CODE". This overrides {@link #MODE}. */ public static final String FORMATS = "SCAN_FORMATS"; - + /** * Optional parameter to specify the id of the camera from which to recognize barcodes. * Overrides the default camera that would otherwise would have been selected. diff --git a/android/src/com/google/zxing/client/android/camera/CameraManager.java b/android/src/com/google/zxing/client/android/camera/CameraManager.java index b9e8b2ca7..8c1ed755d 100755 --- a/android/src/com/google/zxing/client/android/camera/CameraManager.java +++ b/android/src/com/google/zxing/client/android/camera/CameraManager.java @@ -76,7 +76,7 @@ public final class CameraManager { public synchronized void openDriver(SurfaceHolder holder) throws IOException { Camera theCamera = camera; if (theCamera == null) { - + if (requestedCameraId >= 0) { theCamera = OpenCameraInterface.open(requestedCameraId); } else { diff --git a/android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java b/android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java index 752b13a77..813334cb0 100644 --- a/android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java +++ b/android/src/com/google/zxing/client/android/camera/open/OpenCameraInterface.java @@ -40,9 +40,9 @@ public final class OpenCameraInterface { Log.w(TAG, "No cameras!"); return null; } - + boolean explicitRequest = cameraId >= 0; - + if (!explicitRequest) { // Select a camera if no explicit camera requested int index = 0; @@ -57,7 +57,7 @@ public final class OpenCameraInterface { cameraId = index; } - + Camera camera; if (cameraId < numCameras) { Log.i(TAG, "Opening camera #" + cameraId); diff --git a/core/src/main/java/com/google/zxing/ResultPoint.java b/core/src/main/java/com/google/zxing/ResultPoint.java index e6a6fef40..920cd24c5 100644 --- a/core/src/main/java/com/google/zxing/ResultPoint.java +++ b/core/src/main/java/com/google/zxing/ResultPoint.java @@ -71,7 +71,7 @@ public class ResultPoint { * Orders an array of three ResultPoints in an order [A,B,C] such that AB is less than AC * and BC is less than AC, and the angle between BC and BA is less than 180 degrees. * - * @param patterns array of three {@link ResultPoint} to order + * @param patterns array of three {@code ResultPoint} to order */ public static void orderBestPatterns(ResultPoint[] patterns) { diff --git a/core/src/main/java/com/google/zxing/common/CharacterSetECI.java b/core/src/main/java/com/google/zxing/common/CharacterSetECI.java index 141bee866..7c3853ca8 100644 --- a/core/src/main/java/com/google/zxing/common/CharacterSetECI.java +++ b/core/src/main/java/com/google/zxing/common/CharacterSetECI.java @@ -95,7 +95,7 @@ public enum CharacterSetECI { /** * @param value character set ECI value - * @return {@link CharacterSetECI} representing ECI of given value, or null if it is legal but + * @return {@code CharacterSetECI} representing ECI of given value, or null if it is legal but * unsupported * @throws FormatException if ECI value is invalid */ diff --git a/core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java b/core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java index 5c56a2d6b..cf68414fb 100644 --- a/core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java +++ b/core/src/test/java/com/google/zxing/oned/Code128WriterTestCase.java @@ -16,8 +16,7 @@ package com.google.zxing.oned; -import static org.junit.Assert.assertEquals; - +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -26,7 +25,7 @@ import com.google.zxing.Writer; import com.google.zxing.WriterException; import com.google.zxing.common.BitMatrix; -public class Code128WriterTestCase { +public class Code128WriterTestCase extends Assert { private static final String FNC1 = "11110101110"; private static final String FNC2 = "11110101000"; @@ -91,7 +90,7 @@ public class Code128WriterTestCase { assertEquals(expected, actual); } - private String matrixToString(BitMatrix result) { + private static String matrixToString(BitMatrix result) { StringBuilder builder = new StringBuilder(result.getWidth()); for (int i = 0; i < result.getWidth(); i++) { builder.append(result.get(i, 0) ? '1' : '0'); diff --git a/zxing.appspot.com/src/main/webapp/scan.css b/zxing.appspot.com/src/main/webapp/scan.css index 5ce97cbf4..a20512d80 100644 --- a/zxing.appspot.com/src/main/webapp/scan.css +++ b/zxing.appspot.com/src/main/webapp/scan.css @@ -1,10 +1,9 @@ body{ - background-color:#404040; + background: #404040 url("img/bg.png"); text-align:center; color:#FFF; font-size: 20px; font-family: 'Droid Sans',sans-serif; - background-image:url("img/bg.png"); } a img{ border:0;