Changeset 8540 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2015-06-27T21:43:35+02:00 (10 years ago)

Author:

Don-vip

Message:

fix remaining checkstyle issues

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ImageProvider.java (modified) (3 diffs)
• OpenBrowser.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (1 diff)
• template_engine/ParseError.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -857 +857 @@
                     // See #10479: for PNG files, always enforce transparency to be sure tNRS chunk is used even not in paletted mode
                     // This can be removed if someday Oracle fixes https://bugs.openjdk.java.net/browse/JDK-6788458
+                    // CHECKSTYLE.OFF: LineLength
                     // hg.openjdk.java.net/jdk7u/jdk7u/jdk/file/828c4fedd29f/src/share/classes/com/sun/imageio/plugins/png/PNGImageReader.java#l656
+                    // CHECKSTYLE.ON: LineLength
                     Image img = read(new ByteArrayInputStream(bytes), false, true);
                     return img == null ? null : new ImageResource(img);
@@ -1541 +1543 @@
     }
 
+    // CHECKSTYLE.OFF: LineLength
+
     /**
      * Returns the {@code TransparentColor} defined in image reader metadata.
@@ -1551 +1555 @@
      */
     public static Color getTransparentColor(ColorModel model, ImageReader reader) throws IOException {
+        // CHECKSTYLE.ON: LineLength
         try {
             IIOMetadata metadata = reader.getImageMetadata(0);

trunk/src/org/openstreetmap/josm/tools/OpenBrowser.java

@@ -51 +51 @@
                     Main.platform.openUrl(uri.toString());
                 } else {
-                    // This is not the case with some Linux environments (see below), and not sure about Mac OS X, so we need to handle API failure
+                    // This is not the case with some Linux environments (see below),
+                    // and not sure about Mac OS X, so we need to handle API failure
                     try {
                         Desktop.getDesktop().browse(uri);

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -261 +261 @@
         if ("Linux".equalsIgnoreCase(osName)) {
             try {
-                // Try lsb_release (only available on LSB-compliant Linux systems, see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod )
+                // Try lsb_release (only available on LSB-compliant Linux systems,
+                // see https://www.linuxbase.org/lsb-cert/productdir.php?by_prod )
                 Process p = Runtime.getRuntime().exec("lsb_release -ds");
                 try (BufferedReader input = new BufferedReader(new InputStreamReader(p.getInputStream(), StandardCharsets.UTF_8))) {

trunk/src/org/openstreetmap/josm/tools/template_engine/ParseError.java

@@ -17 +17 @@
 
     public ParseError(Token unexpectedToken, TokenType expected) {
-        super(tr("Unexpected token on position {0}. Expected {1}, found {2}", unexpectedToken.getPosition(), expected, unexpectedToken.getType()));
+        super(tr("Unexpected token on position {0}. Expected {1}, found {2}",
+                unexpectedToken.getPosition(), expected, unexpectedToken.getType()));
         this.unexpectedToken = unexpectedToken;
     }