Minor improvements from inspection

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

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

@@ -38,6 +38,7 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JTextArea;
+import javax.swing.WindowConstants;
 
 /**
  * <p>Simple GUI frontend to the library. Right now, only decodes a local file.
@@ -61,7 +62,7 @@ public final class GUIRunner extends JFrame {
     panel.add(textArea);
     setTitle("ZXing");
     setSize(400, 400);
-    setDefaultCloseOperation(EXIT_ON_CLOSE);
+    setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
     setContentPane(panel);
     setLocationRelativeTo(null);
   }

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

@@ -1,62 +1,62 @@
-/*
+/*
- * Copyright 2012 ZXing authors
+ * Copyright 2012 ZXing authors
- *
+ *
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * You may obtain a copy of the License at
- *
+ *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
- * Unless required by applicable law or agreed to in writing, software
+ * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
+ * See the License for the specific language governing permissions and
- * limitations under the License.
+ * limitations under the License.
- */
+ */
-
+
-package com.google.zxing.client.j2se;
+package com.google.zxing.client.j2se;
-
+
-import java.awt.image.BufferedImage;
+import java.awt.image.BufferedImage;
-
+
-/**
+/**
- * Encapsulates custom configuration used in methods of {@link MatrixToImageWriter}.
+ * Encapsulates custom configuration used in methods of {@link MatrixToImageWriter}.
- */
+ */
-public final class MatrixToImageConfig {
+public final class MatrixToImageConfig {
-
+
-  public static final int BLACK = 0xFF000000;
+  public static final int BLACK = 0xFF000000;
-  public static final int WHITE = 0xFFFFFFFF;
+  public static final int WHITE = 0xFFFFFFFF;
-  
+  
-  private final int onColor;
+  private final int onColor;
-  private final int offColor;
+  private final int offColor;
-
+
-  /**
+  /**
-   * Creates a default config with on color {@link #BLACK} and off color {@link #WHITE}, generating normal
+   * Creates a default config with on color {@link #BLACK} and off color {@link #WHITE}, generating normal
-   * black-on-white barcodes.
+   * black-on-white barcodes.
-   */
+   */
-  public MatrixToImageConfig() {
+  public MatrixToImageConfig() {
-    this(BLACK, WHITE);
+    this(BLACK, WHITE);
-  }
+  }
-
+
-  /**
+  /**
-   * @param onColor pixel on color, specified as an ARGB value as an int
+   * @param onColor pixel on color, specified as an ARGB value as an int
-   * @param offColor pixel off color, specified as an ARGB value as an int
+   * @param offColor pixel off color, specified as an ARGB value as an int
-   */
+   */
-  public MatrixToImageConfig(int onColor, int offColor) {
+  public MatrixToImageConfig(int onColor, int offColor) {
-    this.onColor = onColor;
+    this.onColor = onColor;
-    this.offColor = offColor;
+    this.offColor = offColor;
-  }
+  }
-
+
-  public int getPixelOnColor() {
+  public int getPixelOnColor() {
-    return onColor;
+    return onColor;
-  }
+  }
-
+
-  public int getPixelOffColor() {
+  public int getPixelOffColor() {
-    return offColor;
+    return offColor;
-  }
+  }
-
+
-  int getBufferedImageColorModel() {
+  int getBufferedImageColorModel() {
-    // Use faster BINARY if colors match default
+    // Use faster BINARY if colors match default
-    return onColor == BLACK && offColor == WHITE ? BufferedImage.TYPE_BYTE_BINARY : BufferedImage.TYPE_INT_RGB;
+    return onColor == BLACK && offColor == WHITE ? BufferedImage.TYPE_BYTE_BINARY : BufferedImage.TYPE_INT_RGB;
-  }
+  }
-
+
 }

zxingorg/pom.xml

@@ -132,7 +132,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.9.1</version>
         <configuration>
           <javadocVersion>1.7</javadocVersion>
           <header><![CDATA[