More reckless refactoring and code style tweaks -- mostly adding braces around conditional/loops, and using @Override

git-svn-id: https://zxing.googlecode.com/svn/trunk@784 59b500cc-1b3d-0410-9834-0bbf25fbcc57

android/src/com/google/zxing/client/android/AndroidHttpClient.java

@@ -20,7 +20,6 @@ import android.util.Log;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntityEnclosingRequest;
-import org.apache.http.HttpException;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpMessage;
 import org.apache.http.HttpRequest;
@@ -212,7 +211,9 @@ public final class AndroidHttpClient implements HttpClient {
     if (contentEncoding == null) {
       return responseStream;
     }
-    if (contentEncoding.contains("gzip")) responseStream = new GZIPInputStream(responseStream);
+    if (contentEncoding.contains("gzip")) {
+      responseStream = new GZIPInputStream(responseStream);
+    }
     return responseStream;
   }
 
@@ -281,7 +282,7 @@ public final class AndroidHttpClient implements HttpClient {
    * @param data The bytes to compress
    * @return Entity holding the data
    */
-  public static AbstractHttpEntity getCompressedEntity(byte data[]) throws IOException {
+  public static AbstractHttpEntity getCompressedEntity(byte[] data) throws IOException {
     AbstractHttpEntity entity;
     if (data.length < getMinGzipSize()) {
       entity = new ByteArrayEntity(data);
@@ -371,7 +372,7 @@ public final class AndroidHttpClient implements HttpClient {
    * Logs cURL commands equivalent to requests.
    */
   private final class CurlLogger implements HttpRequestInterceptor {
-    public final void process(HttpRequest request, HttpContext context)
+    public void process(HttpRequest request, HttpContext context)
         throws IOException {
       LoggingConfiguration configuration = curlConfiguration;
       if (configuration != null

android/src/com/google/zxing/client/android/BookmarkPickerActivity.java

@@ -51,7 +51,7 @@ public final class BookmarkPickerActivity extends ListActivity {
   private Cursor mCursor;
 
   @Override
-  protected final void onCreate(Bundle icicle) {
+  protected void onCreate(Bundle icicle) {
     super.onCreate(icicle);
 
     mCursor = getContentResolver().query(Browser.BOOKMARKS_URI, BOOKMARK_PROJECTION,
@@ -64,7 +64,7 @@ public final class BookmarkPickerActivity extends ListActivity {
   }
 
   @Override
-  protected final void onListItemClick(ListView l, View view, int position, long id) {
+  protected void onListItemClick(ListView l, View view, int position, long id) {
     if (mCursor.moveToPosition(position)) {
       Intent intent = new Intent();
       intent.putExtra(Browser.BookmarkColumns.TITLE, mCursor.getString(TITLE_COLUMN));

android/src/com/google/zxing/client/android/CaptureActivity.java

@@ -223,7 +223,7 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
         startActivity(intent);
         break;
       }
-      case ABOUT_ID: {
+      case ABOUT_ID:
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
         builder.setTitle(R.string.title_about);
         builder.setMessage(getString(R.string.msg_about) + "\n\n" + getString(R.string.zxing_url));
@@ -232,7 +232,6 @@ public final class CaptureActivity extends Activity implements SurfaceHolder.Cal
         builder.setNegativeButton(R.string.button_cancel, null);
         builder.show();
         break;
-      }
     }
     return super.onOptionsItemSelected(item);
   }

android/src/com/google/zxing/client/android/CaptureActivityHandler.java

@@ -53,6 +53,7 @@ public final class CaptureActivityHandler extends Handler {
     }
   }
 
+  @Override
   public void handleMessage(Message message) {
     switch (message.what) {
       case R.id.auto_focus:

android/src/com/google/zxing/client/android/DecodeThread.java

@@ -75,6 +75,7 @@ final class DecodeThread extends Thread {
   public void run() {
     Looper.prepare();
     mHandler = new Handler() {
+      @Override
       public void handleMessage(Message message) {
         switch (message.what) {
           case R.id.decode:

android/src/com/google/zxing/client/android/EncodeActivity.java

@@ -94,6 +94,7 @@ public final class EncodeActivity extends Activity {
   };
 
   public final Handler mHandler = new Handler() {
+    @Override
     public void handleMessage(Message message) {
       switch (message.what) {
         case R.id.encode_succeeded:

android/src/com/google/zxing/client/android/QRCodeEncoder.java

@@ -65,9 +65,13 @@ public final class QRCodeEncoder {
 
   // TODO: The string encoding should live in the core ZXing library.
   private boolean encodeContents(Intent intent) {
-    if (intent == null) return false;
+    if (intent == null) {
+      return false;
+    }
     String type = intent.getStringExtra(Intents.Encode.TYPE);
-    if (type == null || type.length() == 0) return false;
+    if (type == null || type.length() == 0) {
+      return false;
+    }
 
     if (type.equals(Contents.Type.TEXT)) {
       String string = intent.getStringExtra(Intents.Encode.DATA);
@@ -142,7 +146,7 @@ public final class QRCodeEncoder {
     return mContents != null && mContents.length() > 0;
   }
 
-  private final static class EncodeThread extends Thread {
+  private static final class EncodeThread extends Thread {
 
     private final String mContents;
     private final Handler mHandler;
@@ -154,7 +158,7 @@ public final class QRCodeEncoder {
       mPixelResolution = pixelResolution;
     }
 
-    public final void run() {
+    public void run() {
       try {
         ByteMatrix result = new MultiFormatWriter().encode(mContents, BarcodeFormat.QR_CODE,
              mPixelResolution, mPixelResolution);

android/src/com/google/zxing/client/android/SearchBookContentsActivity.java

@@ -113,6 +113,7 @@ public final class SearchBookContentsActivity extends Activity {
   }
 
   public final Handler mHandler = new Handler() {
+    @Override
     public void handleMessage(Message message) {
       switch (message.what) {
         case R.id.search_book_contents_succeeded:
@@ -237,7 +238,8 @@ public final class SearchBookContentsActivity extends Activity {
       mUserAgent = userAgent;
     }
 
-    public final void run() {
+    @Override
+    public void run() {
       AndroidHttpClient client = null;
       try {
         // These return a JSON result which describes if and where the query was found. This API may

android/src/com/google/zxing/client/android/SearchBookContentsListItem.java

@@ -57,7 +57,9 @@ public final class SearchBookContentsListItem extends LinearLayout {
         int offset = 0;
         while (true) {
           int pos = lowerSnippet.indexOf(lowerQuery, offset);
-          if (pos < 0) break;
+          if (pos < 0) {
+            break;
+          }
           styledSnippet.setSpan(boldSpan, pos, pos + queryLength, 0);
           offset = pos + queryLength;
         }

android/src/com/google/zxing/client/android/SearchBookContentsResult.java

@@ -18,7 +18,7 @@ package com.google.zxing.client.android;
 
 public final class SearchBookContentsResult {
 
-  static private String sQuery;
+  private static String sQuery;
 
   private final String mPageNumber;
   private final String mSnippet;

android/src/com/google/zxing/client/android/ShareActivity.java

@@ -18,7 +18,6 @@ package com.google.zxing.client.android;
 
 import android.app.Activity;
 import android.content.ContentResolver;
-import android.content.Context;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
@@ -38,7 +37,7 @@ public final class ShareActivity extends Activity {
   private static final int METHODS_KIND_COLUMN = 1;
   private static final int METHODS_DATA_COLUMN = 2;
 
-  private static final String[] METHODS_PROJECTION = new String[] {
+  private static final String[] METHODS_PROJECTION = {
     Contacts.People.ContactMethods._ID, // 0
     Contacts.People.ContactMethods.KIND, // 1
     Contacts.People.ContactMethods.DATA, // 2
@@ -63,7 +62,7 @@ public final class ShareActivity extends Activity {
   protected void onResume() {
     super.onResume();
 
-    ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+    ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
     if (clipboard.hasText()) {
       mClipboardButton.setEnabled(true);
       mClipboardButton.setText(R.string.button_share_clipboard);
@@ -95,7 +94,7 @@ public final class ShareActivity extends Activity {
 
   private final Button.OnClickListener mClipboardListener = new Button.OnClickListener() {
     public void onClick(View v) {
-      ClipboardManager clipboard = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+      ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
       // Should always be true, because we grey out the clipboard button in onResume() if it's empty
       if (clipboard.hasText()) {
         Intent intent = new Intent(Intents.Encode.ACTION);
@@ -158,8 +157,8 @@ public final class ShareActivity extends Activity {
       boolean foundPostal = false;
       if (methodsCursor != null) {
         while (methodsCursor.moveToNext()) {
-          final int kind = methodsCursor.getInt(METHODS_KIND_COLUMN);
+          int kind = methodsCursor.getInt(METHODS_KIND_COLUMN);
-          final String data = methodsCursor.getString(METHODS_DATA_COLUMN);
+          String data = methodsCursor.getString(METHODS_DATA_COLUMN);
           switch (kind) {
             case Contacts.KIND_EMAIL:
               if (!foundEmail) {

android/src/com/google/zxing/client/android/result/AddressBookResultHandler.java

@@ -43,8 +43,12 @@ public final class AddressBookResultHandler extends ResultHandler {
     if (index < mButtonCount) {
       int count = -1;
       for (int x = 0; x < MAX_BUTTON_COUNT; x++) {
-        if (mFields[x]) count++;
+        if (mFields[x]) {
-        if (count == index) return x;
+          count++;
+        }
+        if (count == index) {
+          return x;
+        }
       }
     }
     return -1;
@@ -68,14 +72,18 @@ public final class AddressBookResultHandler extends ResultHandler {
 
     mButtonCount = 0;
     for (int x = 0; x < MAX_BUTTON_COUNT; x++) {
-      if (mFields[x]) mButtonCount++;
+      if (mFields[x]) {
+        mButtonCount++;
+      }
     }
   }
 
+  @Override
   public int getButtonCount() {
     return mButtonCount;
   }
 
+  @Override
   public int getButtonText(int index) {
     int action = mapIndexToAction(index);
     switch (action) {
@@ -92,6 +100,7 @@ public final class AddressBookResultHandler extends ResultHandler {
     }
   }
 
+  @Override
   public void handleButtonPress(int index) {
     AddressBookParsedResult addressResult = (AddressBookParsedResult) mResult;
     int action = mapIndexToAction(index);
@@ -165,6 +174,7 @@ public final class AddressBookResultHandler extends ResultHandler {
     }
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_address_book;
   }

android/src/com/google/zxing/client/android/result/CalendarResultHandler.java

@@ -41,14 +41,17 @@ public final class CalendarResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
     return mButtons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
     return mButtons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
     CalendarParsedResult calendarResult = (CalendarParsedResult) mResult;
     switch (index) {
@@ -68,7 +71,9 @@ public final class CalendarResultHandler extends ResultHandler {
 
     // The end can be null if the event has no duration, so use the start time.
     String endString = calResult.getEnd();
-    if (endString == null) endString = calResult.getStart();
+    if (endString == null) {
+      endString = calResult.getStart();
+    }
     appendTime(endString, result);
 
     ParsedResult.maybeAppend(calResult.getLocation(), result);
@@ -77,7 +82,7 @@ public final class CalendarResultHandler extends ResultHandler {
     return result.toString();
   }
 
-  private void appendTime(String when, StringBuffer result) {
+  private static void appendTime(String when, StringBuffer result) {
     if (when.length() == 8) {
       // Show only year/month/day
       Date date;
@@ -101,6 +106,7 @@ public final class CalendarResultHandler extends ResultHandler {
     }
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_calendar;
   }

android/src/com/google/zxing/client/android/result/EmailAddressResultHandler.java

@@ -32,14 +32,17 @@ public final class EmailAddressResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
     return mButtons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
     return mButtons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
     EmailAddressParsedResult emailResult = (EmailAddressParsedResult) mResult;
     switch (index) {
@@ -54,6 +57,7 @@ public final class EmailAddressResultHandler extends ResultHandler {
     }
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_email_address;
   }

android/src/com/google/zxing/client/android/result/GeoResultHandler.java

@@ -32,14 +32,17 @@ public final class GeoResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
     return mButtons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
     return mButtons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
     GeoParsedResult geoResult = (GeoParsedResult) mResult;
     switch (index) {
@@ -52,6 +55,7 @@ public final class GeoResultHandler extends ResultHandler {
     }
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_geo;
   }

android/src/com/google/zxing/client/android/result/ISBNResultHandler.java

@@ -33,14 +33,17 @@ public final class ISBNResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
     return mButtons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
     return mButtons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
     ISBNParsedResult isbnResult = (ISBNParsedResult) mResult;
     switch (index) {
@@ -56,6 +59,7 @@ public final class ISBNResultHandler extends ResultHandler {
     }
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_isbn;
   }

android/src/com/google/zxing/client/android/result/ProductResultHandler.java

@@ -32,14 +32,17 @@ public final class ProductResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
     return mButtons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
     return mButtons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
     ProductParsedResult productResult = (ProductParsedResult) mResult;
     switch (index) {
@@ -52,6 +55,7 @@ public final class ProductResultHandler extends ResultHandler {
     }
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_product;
   }

android/src/com/google/zxing/client/android/result/SMSResultHandler.java

@@ -33,14 +33,17 @@ public final class SMSResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
     return mButtons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
     return mButtons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
     SMSParsedResult smsResult = (SMSParsedResult) mResult;
     switch (index) {
@@ -65,6 +68,7 @@ public final class SMSResultHandler extends ResultHandler {
     return contents.toString();
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_sms;
   }

android/src/com/google/zxing/client/android/result/TelResultHandler.java

@@ -33,14 +33,17 @@ public final class TelResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
     return mButtons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
     return mButtons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
     TelParsedResult telResult = (TelParsedResult) mResult;
     switch (index) {
@@ -63,6 +66,7 @@ public final class TelResultHandler extends ResultHandler {
     return PhoneNumberUtils.formatNumber(contents);
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_tel;
   }

android/src/com/google/zxing/client/android/result/TextResultHandler.java

@@ -35,14 +35,17 @@ public final class TextResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
     return mButtons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
     return mButtons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
     switch (index) {
       case 0:
@@ -57,6 +60,7 @@ public final class TextResultHandler extends ResultHandler {
     }
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_text;
   }

android/src/com/google/zxing/client/android/result/URIResultHandler.java

@@ -33,14 +33,17 @@ public final class URIResultHandler extends ResultHandler {
     super(activity, result);
   }
 
+  @Override
   public int getButtonCount() {
     return mButtons.length;
   }
 
+  @Override
   public int getButtonText(int index) {
     return mButtons[index];
   }
 
+  @Override
   public void handleButtonPress(int index) {
     URIParsedResult uriResult = (URIParsedResult) mResult;
     switch (index) {
@@ -56,6 +59,7 @@ public final class URIResultHandler extends ResultHandler {
     }
   }
 
+  @Override
   public int getDisplayTitle() {
     return R.string.result_uri;
   }

androidtest/src/com/google/zxing/client/androidtest/BenchmarkActivity.java

@@ -37,7 +37,7 @@ public final class BenchmarkActivity extends Activity {
   private BenchmarkThread mBenchmarkThread;
 
   @Override
-  public final void onCreate(Bundle icicle) {
+  public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
 
     setContentView(R.layout.benchmark);
@@ -61,6 +61,7 @@ public final class BenchmarkActivity extends Activity {
   };
 
   public final Handler mHandler = new Handler() {
+    @Override
     public void handleMessage(Message message) {
       switch (message.what) {
         case R.id.benchmark_done:

androidtest/src/com/google/zxing/client/androidtest/BenchmarkItem.java

@@ -35,21 +35,21 @@ public final class BenchmarkItem {
     mFormat = null;
   }
 
-  public final void addResult(int microseconds) {
+  public void addResult(int microseconds) {
     mTimes[mPosition] = microseconds;
     mPosition++;
   }
 
-  public final void setDecoded(boolean decoded) {
+  public void setDecoded(boolean decoded) {
     mDecoded = decoded;
   }
 
-  public final void setFormat(BarcodeFormat format) {
+  public void setFormat(BarcodeFormat format) {
     mFormat = format;
   }
 
   @Override
-  public final String toString() {
+  public String toString() {
     StringBuffer result = new StringBuffer();
     result.append(mDecoded ? ("DECODED " + mFormat.toString() + ": ") : "FAILED: ");
     result.append(mPath);

androidtest/src/com/google/zxing/client/androidtest/CameraTestActivity.java

@@ -76,19 +76,18 @@ public final class CameraTestActivity extends Activity implements SurfaceHolder.
   }
 
   public final Handler mHandler = new Handler() {
+    @Override
     public void handleMessage(Message message) {
       switch (message.what) {
         case R.id.auto_focus:
           // Do not continuously auto focus
           break;
-        case R.id.save_succeeded: {
+        case R.id.save_succeeded:
           Toast.makeText(CameraTestActivity.this, R.string.save_succeeded, 500).show();
           break;
-        }
+        case R.id.save_failed:
-        case R.id.save_failed: {
           Toast.makeText(CameraTestActivity.this, R.string.save_failed, 2000).show();
           break;
-        }
       }
     }
   };

androidtest/src/com/google/zxing/client/androidtest/RGBMonochromeBitmapSource.java

@@ -62,19 +62,19 @@ public final class RGBMonochromeBitmapSource extends BaseMonochromeBitmapSource
     }
   }
 
-  public final int getHeight() {
+  public int getHeight() {
     return mHeight;
   }
 
-  public final int getWidth() {
+  public int getWidth() {
     return mWidth;
   }
 
-  protected final int getLuminance(int x, int y) {
+  protected int getLuminance(int x, int y) {
     return mLuminances[y * mWidth + x] & 0xff;
   }
 
-  protected final int[] getLuminanceRow(int y, int[] row) {
+  protected int[] getLuminanceRow(int y, int[] row) {
     int width = mWidth;
     if (row == null || row.length < width) {
       row = new int[width];
@@ -86,7 +86,7 @@ public final class RGBMonochromeBitmapSource extends BaseMonochromeBitmapSource
     return row;
   }
 
-  protected final int[] getLuminanceColumn(int x, int[] column) {
+  protected int[] getLuminanceColumn(int x, int[] column) {
     int width = mWidth;
     int height = mHeight;
     if (column == null || column.length < height) {

androidtest/src/com/google/zxing/client/androidtest/SaveThread.java

@@ -48,6 +48,7 @@ final class SaveThread extends Thread {
   public void run() {
     Looper.prepare();
     mHandler = new Handler() {
+      @Override
       public void handleMessage(Message message) {
         switch (message.what) {
           case R.id.save:

androidtest/src/com/google/zxing/client/androidtest/ViewfinderView.java

@@ -44,7 +44,7 @@ public final class ViewfinderView extends View {
   }
 
   @Override
-  public final void onDraw(Canvas canvas) {
+  public void onDraw(Canvas canvas) {
     Rect frame = CameraManager.get().getFramingRect();
     int width = canvas.getWidth();
     int height = canvas.getHeight();

androidtest/src/com/google/zxing/client/androidtest/ZXingTestActivity.java

@@ -27,7 +27,7 @@ import android.widget.Button;
 public final class ZXingTestActivity extends Activity {
 
   @Override
-  public final void onCreate(Bundle icicle) {
+  public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
 
     setContentView(R.layout.test);
@@ -124,7 +124,7 @@ public final class ZXingTestActivity extends Activity {
   };
 
   @Override
-  public final void onActivityResult(int requestCode, int resultCode, Intent intent) {
+  public void onActivityResult(int requestCode, int resultCode, Intent intent) {
     if (requestCode == 0) {
       if (resultCode == RESULT_OK) {
         String contents = intent.getStringExtra("SCAN_RESULT");

core/src/com/google/zxing/ResultMetadataType.java

@@ -46,7 +46,7 @@ public final class ResultMetadataType {
    * the complete raw bytes in the barcode for these formats, it does not offer the bytes
    * from the byte segments alone.</p>
    *
-   * <p>This maps to a {@link java.util.Vector} of {@link byte[]}s corresponding to the
+   * <p>This maps to a {@link java.util.Vector} of byte arrays corresponding to the
    * raw bytes in the byte segments in the barcode, in order.</p>
    */
   public static final ResultMetadataType BYTE_SEGMENTS = new ResultMetadataType();

core/src/com/google/zxing/client/result/VCardResultParser.java

@@ -61,7 +61,7 @@ final class VCardResultParser extends ResultParser {
   private static String[] matchVCardPrefixedField(String prefix, String rawText, boolean trim) {
     Vector matches = null;
     int i = 0;
-    final int max = rawText.length();
+    int max = rawText.length();
     while (i < max) {
       i = rawText.indexOf(prefix, i);
       if (i < 0) {

core/src/com/google/zxing/common/ByteMatrix.java

@@ -39,31 +39,31 @@ public final class ByteMatrix {
     this.width = width;
   }
 
-  public final int height() {
+  public int height() {
     return height;
   }
 
-  public final int width() {
+  public int width() {
     return width;
   }
 
-  public final byte get(int y, int x) {
+  public byte get(int y, int x) {
     return bytes[y][x];
   }
 
-  public final byte[][] getArray() {
+  public byte[][] getArray() {
     return bytes;
   }
 
-  public final void set(int y, int x, byte value) {
+  public void set(int y, int x, byte value) {
     bytes[y][x] = value;
   }
 
-  public final void set(int y, int x, int value) {
+  public void set(int y, int x, int value) {
     bytes[y][x] = (byte) value;
   }
 
-  public final void clear(byte value) {
+  public void clear(byte value) {
     for (int y = 0; y < height; ++y) {
       for (int x = 0; x < width; ++x) {
         bytes[y][x] = value;
@@ -71,7 +71,7 @@ public final class ByteMatrix {
     }
   }
 
-  public final String toString() {
+  public String toString() {
     StringBuffer result = new StringBuffer();
     for (int y = 0; y < height; ++y) {
       for (int x = 0; x < width; ++x) {

core/src/com/google/zxing/datamatrix/detector/Detector.java

@@ -134,7 +134,7 @@ public final class Detector {
     }
 
     // Bottom left is correct but top left and bottom right might be switched
-    ResultPoint[] corners = new ResultPoint[] { maybeTopLeft, bottomLeft, maybeBottomRight };
+    ResultPoint[] corners = { maybeTopLeft, bottomLeft, maybeBottomRight };
     // Use the dot product trick to sort them out
     GenericResultPoint.orderBestPatterns(corners);
 

core/src/com/google/zxing/oned/ITFReader.java

@@ -73,7 +73,7 @@ public final class ITFReader extends AbstractOneDReader {
       {N, W, N, W, N}  // 9
   };
 
-  public final Result decodeRow(int rowNumber, BitArray row, Hashtable hints) throws ReaderException {
+  public Result decodeRow(int rowNumber, BitArray row, Hashtable hints) throws ReaderException {
 
     StringBuffer result = new StringBuffer(20);
 
@@ -149,7 +149,7 @@ public final class ITFReader extends AbstractOneDReader {
    */
   int[] decodeStart(BitArray row) throws ReaderException {
     int endStart = skipWhiteSpace(row);
-    int startPattern[] = findGuardPattern(row, endStart, START_PATTERN);
+    int[] startPattern = findGuardPattern(row, endStart, START_PATTERN);
 
     // Determine the width of a narrow line in pixels. We can do this by
     // getting the width of the start pattern and dividing by 4 because its
@@ -231,7 +231,7 @@ public final class ITFReader extends AbstractOneDReader {
     row.reverse();
 
     int endStart = skipWhiteSpace(row);
-    int endPattern[];
+    int[] endPattern;
     try {
       endPattern = findGuardPattern(row, endStart, END_PATTERN_REVERSED);
     } catch (ReaderException e) {

core/src/com/google/zxing/qrcode/QRCodeWriter.java

@@ -20,7 +20,6 @@ import com.google.zxing.BarcodeFormat;
 import com.google.zxing.EncodeHintType;
 import com.google.zxing.Writer;
 import com.google.zxing.WriterException;
-import com.google.zxing.common.ByteArray;
 import com.google.zxing.common.ByteMatrix;
 import com.google.zxing.qrcode.encoder.Encoder;
 import com.google.zxing.qrcode.encoder.QRCode;
@@ -74,7 +73,7 @@ public final class QRCodeWriter implements Writer {
 
   // Note that the input matrix uses 0 == white, 1 == black, while the output matrix uses
   // 0 == black, 255 == white (i.e. an 8 bit greyscale bitmap).
-  private ByteMatrix renderResult(QRCode code, final int width, final int height) {
+  private ByteMatrix renderResult(QRCode code, int width, int height) {
     ByteMatrix input = code.getMatrix();
     int inputWidth = input.width();
     int inputHeight = input.height();
@@ -104,7 +103,7 @@ public final class QRCodeWriter implements Writer {
     }
 
     // 2. Expand the QR image to the multiple
-    final byte[][] inputArray = input.getArray();
+    byte[][] inputArray = input.getArray();
     for (int y = 0; y < inputHeight; y++) {
       // a. Write the white pixels at the left of each row
       for (int x = 0; x < leftPadding; x++) {

core/src/com/google/zxing/qrcode/decoder/ErrorCorrectionLevel.java

@@ -16,8 +16,6 @@
 
 package com.google.zxing.qrcode.decoder;
 
-import com.google.zxing.ReaderException;
-
 /**
  * <p>See ISO 18004:2006, 6.5.1. This enum encapsulates the four error correction levels
  * defined by the QR code standard.</p>

core/src/com/google/zxing/qrcode/decoder/FormatInformation.java

@@ -72,7 +72,7 @@ final class FormatInformation {
    * Offset i holds the number of 1 bits in the binary representation of i
    */
   private static final int[] BITS_SET_IN_HALF_BYTE =
-      new int[]{0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
+      {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4};
 
   private final ErrorCorrectionLevel errorCorrectionLevel;
   private final byte dataMask;

javame/src/com/google/zxing/client/j2me/AdvancedMultimediaManager.java

@@ -35,9 +35,6 @@ final class AdvancedMultimediaManager implements MultimediaManager {
   private static final long FOCUS_TIME_MS = 750L;
   private static final String DESIRED_METERING = "center-weighted";
 
-  AdvancedMultimediaManager() {
-  }
-
   public void setFocus(Controllable player) {
     FocusControl focusControl = (FocusControl)
         player.getControl("javax.microedition.amms.control.camera.FocusControl");

javame/src/com/google/zxing/client/j2me/DefaultMultimediaManager.java

@@ -25,9 +25,6 @@ import javax.microedition.media.Controllable;
  */
 final class DefaultMultimediaManager implements MultimediaManager {
 
-  DefaultMultimediaManager() {
-  }
-
   public void setFocus(Controllable player) {
   }
 

javase/src/com/google/zxing/client/j2se/BufferedImageMonochromeBitmapSource.java

@@ -84,10 +84,12 @@ public final class BufferedImageMonochromeBitmapSource extends BaseMonochromeBit
     return image;
   }
 
+  @Override
   public int getHeight() {
     return height;
   }
 
+  @Override
   public int getWidth() {
     return width;
   }
@@ -127,6 +129,7 @@ public final class BufferedImageMonochromeBitmapSource extends BaseMonochromeBit
    *
    * where R, G, and B are values in [0,1].
    */
+  @Override
   protected int getLuminance(int x, int y) {
     int pixel = image.getRGB(left + x, top + y);
     // Coefficients add up to 1024 to make the divide into a fast shift
@@ -135,6 +138,7 @@ public final class BufferedImageMonochromeBitmapSource extends BaseMonochromeBit
         117 * (pixel & 0xFF)) >> 10;
   }
 
+  @Override
   protected int[] getLuminanceRow(int y, int[] row) {
     if (row == null || row.length < width) {
       row = new int[width];
@@ -149,6 +153,7 @@ public final class BufferedImageMonochromeBitmapSource extends BaseMonochromeBit
     return row;
   }
 
+  @Override
   protected int[] getLuminanceColumn(int x, int[] column) {
     if (column == null || column.length < height) {
       column = new int[height];

javase/src/com/google/zxing/client/j2se/ImageConverter.java

@@ -58,7 +58,9 @@ public final class ImageConverter {
       }
     }
     for (String arg : args) {
-      if (arg.startsWith("-")) continue;
+      if (arg.startsWith("-")) {
+        continue;
+      }
       File inputFile = new File(arg);
       if (inputFile.exists()) {
         if (inputFile.isDirectory()) {