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

Timestamp:

2016-06-15T10:30:37+02:00 (7 years ago)

Author:

Don-vip

Message:

Checkstyle 6.19: enable SingleSpaceSeparator and fix violations

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ColorScale.java (modified) (2 diffs)
• Diff.java (modified) (2 diffs)
• ExifReader.java (modified) (2 diffs)
• Geometry.java (modified) (1 diff)
• ImageProvider.java (modified) (1 diff)
• MultikeyShortcutAction.java (modified) (1 diff)
• PlatformHookUnixoid.java (modified) (1 diff)
• PlatformHookWindows.java (modified) (1 diff)
• Shortcut.java (modified) (2 diffs)
• TextTagParser.java (modified) (3 diffs)
• WindowGeometry.java (modified) (3 diffs)
• XmlObjectParser.java (modified) (2 diffs)
• template_engine/TemplateParser.java (modified) (1 diff)

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

@@ -37 +37 @@
     public static ColorScale createCyclicScale(int count) {
         ColorScale sc = new ColorScale();
-        //                    red   yellow  green   blue    red
-        int[] h = new int[] {0,    59,     127,    244,    360};
+        // CHECKSTYLE.OFF: SingleSpaceSeparator
+        //                   red  yellow  green   blue    red
+        int[] h = new int[] {0,    59,     127,    244,   360};
         int[] s = new int[] {100,  84,     99,     100};
         int[] b = new int[] {90,   93,     74,     83};
+        // CHECKSTYLE.ON: SingleSpaceSeparator
 
         sc.colors = new Color[count];
@@ -166 +168 @@
         for (int i = 0; i <= intervalCount; i++) {
             g.setColor(colors[(int) (1.0*i*n/intervalCount-1e-10)]);
-            final double val =  min+i*(max-min)/intervalCount;
+            final double val = min+i*(max-min)/intervalCount;
             final String txt = String.format("%.3f", val*valueScale);
             if (w < h) {

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

@@ -327 +327 @@
     static class ReverseScript implements ScriptBuilder {
         @Override
-        public  Change build_script(
+        public Change build_script(
                 final boolean[] changed0, int len0,
                 final boolean[] changed1, int len1) {
@@ -828 +828 @@
         private final int bufferedLines;
 
-        /** Vector, indexed by line number, containing an equivalence code for
-           each line.  It is this vector that is actually compared with that
-           of another file to generate differences. */
-        private final int[]     equivs;
-
-        /** Vector, like the previous one except that
-           the elements for discarded lines have been squeezed out.  */
-        private final int[]    undiscarded;
-
-        /** Vector mapping virtual line numbers (not counting discarded lines)
-           to real ones (counting those lines).  Both are origin-0.  */
-        private final int[]    realindexes;
+        /** Vector, indexed by line number, containing an equivalence code for each line.
+         * It is this vector that is actually compared with that of another file to generate differences. */
+        private final int[] equivs;
+
+        /** Vector, like the previous one except that the elements for discarded lines have been squeezed out. */
+        private final int[] undiscarded;
+
+        /** Vector mapping virtual line numbers (not counting discarded lines) to real ones (counting those lines).
+         * Both are origin-0.  */
+        private final int[] realindexes;
 
         /** Total number of nondiscarded lines. */
-        private int         nondiscardedLines;
-
-        /** Array, indexed by real origin-1 line number,
-           containing true for a line that is an insertion or a deletion.
-           The results of comparison are stored here.  */
-        private boolean[]       changedFlag;
+        private int nondiscardedLines;
+
+        /** Array, indexed by real origin-1 line number, containing true for a line that is an insertion or a deletion.
+           The results of comparison are stored here. */
+        private boolean[] changedFlag;
     }
 }

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

@@ -179 +179 @@
     }
 
-    private static double readAxis(GpsDirectory dirGps, int gpsTag, int gpsTagRef, char cRef) throws MetadataException  {
+    private static double readAxis(GpsDirectory dirGps, int gpsTag, int gpsTagRef, char cRef) throws MetadataException {
         double value;
         Rational[] components = dirGps.getRationalArray(gpsTag);
@@ -205 +205 @@
      * Returns a Transform that fixes the image orientation.
      *
-     * Only orientation 1, 3, 6 and 8 are supported. Everything else is treated
-     * as 1.
+     * Only orientation 1, 3, 6 and 8 are supported. Everything else is treated as 1.
      * @param orientation the exif-orientation of the image
      * @param width the original width of the image

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

@@ -789 +789 @@
 
         BigDecimal d = new BigDecimal(3, MathContext.DECIMAL128); // 1/2 * 6 = 3
-        area  = area.multiply(d, MathContext.DECIMAL128);
+        area = area.multiply(d, MathContext.DECIMAL128);
         if (area.compareTo(BigDecimal.ZERO) != 0) {
             north = north.divide(area, MathContext.DECIMAL128);

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

@@ -102 +102 @@
 public class ImageProvider {
 
+    // CHECKSTYLE.OFF: SingleSpaceSeparator
     private static final String HTTP_PROTOCOL  = "http://";
     private static final String HTTPS_PROTOCOL = "https://";
     private static final String WIKI_PROTOCOL  = "wiki://";
+    // CHECKSTYLE.ON: SingleSpaceSeparator
 
     /**

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

@@ -27 +27 @@
                 return '0';
             else
-                return (char) ('A' +  index - 10);
+                return (char) ('A' + index - 10);
         }
 

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

@@ -232 +232 @@
     public static String getPackageDetails(String ... packageNames) {
         try {
+            // CHECKSTYLE.OFF: SingleSpaceSeparator
             boolean dpkg = Files.exists(Paths.get("/usr/bin/dpkg-query"));
             boolean eque = Files.exists(Paths.get("/usr/bin/equery"));
             boolean rpm  = Files.exists(Paths.get("/bin/rpm"));
+            // CHECKSTYLE.ON: SingleSpaceSeparator
             if (dpkg || rpm || eque) {
                 for (String packageName : packageNames) {

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

@@ -79 +79 @@
         (byte) 0xfc, (byte) 0xf1, 0x7f, 0x73, (byte) 0xa7, (byte) 0x9d, (byte) 0xde, (byte) 0xc7, (byte) 0x88, 0x57, 0x51,
         (byte) 0x84, (byte) 0xed, (byte) 0x96, (byte) 0xfb, (byte) 0xe1, 0x38, (byte) 0xef, 0x08, 0x2b, (byte) 0xf3,
-        (byte) 0xc7, (byte) 0xc3,  0x5d, (byte) 0xfe, (byte) 0xf9, 0x51, (byte) 0xe6, 0x29, (byte) 0xfc, (byte) 0xe5, 0x0d,
+        (byte) 0xc7, (byte) 0xc3, 0x5d, (byte) 0xfe, (byte) 0xf9, 0x51, (byte) 0xe6, 0x29, (byte) 0xfc, (byte) 0xe5, 0x0d,
         (byte) 0xa1, 0x0d, (byte) 0xa8, (byte) 0xb4, (byte) 0xae, 0x26, 0x18, 0x19, 0x4d, 0x6c, 0x0c, 0x3b, 0x12, (byte) 0xba,
         (byte) 0xbc, 0x5f, 0x32, (byte) 0xb3, (byte) 0xbe, (byte) 0x9d, 0x17, 0x0d, 0x4d, 0x2f, 0x1a, 0x48, (byte) 0xb7,

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

@@ -221 +221 @@
      */
     public void setMnemonic(AbstractButton button) {
-        if (assignedModifier == getGroupModifier(MNEMONIC)  && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) {
+        if (assignedModifier == getGroupModifier(MNEMONIC) && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) {
             button.setMnemonic(KeyEvent.getKeyText(assignedKey).charAt(0)); //getKeyStroke().getKeyChar() seems not to work here
         }
@@ -231 +231 @@
      */
     public void setFocusAccelerator(JTextComponent component) {
-        if (assignedModifier == getGroupModifier(MNEMONIC)  && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) {
+        if (assignedModifier == getGroupModifier(MNEMONIC) && getKeyStroke() != null && KeyEvent.getKeyText(assignedKey).length() == 1) {
             component.setFocusAccelerator(KeyEvent.getKeyText(assignedKey).charAt(0));
         }

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

@@ -125 +125 @@
             while (pos < n) {
                 c = data.charAt(pos);
-                if (c == '\t' || c == '\n'  || c == ' ') {
+                if (c == '\t' || c == '\n' || c == ' ') {
                     pos++;
                 } else if (c == '=') {
@@ -177 +177 @@
          String k;
          String v;
-         for (String  line: lines) {
+         for (String line: lines) {
             if (line.trim().isEmpty()) continue; // skip empty lines
             Matcher m = p.matcher(line);
@@ -195 +195 @@
          if (!tags.isEmpty()) {
             return tags;
-         }  else {
+         } else {
             return null;
          }

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

@@ -58 +58 @@
      * @param window the window
      */
-    public WindowGeometry(Window window)  {
+    public WindowGeometry(Window window) {
         this(window.getLocationOnScreen(), window.getSize());
     }
@@ -165 +165 @@
      * @param window the window
      */
-    public void fixScreen(Window window)  {
+    public void fixScreen(Window window) {
         Rectangle oldScreen = getScreenInfo(getRectangle());
         Rectangle newScreen = getScreenInfo(new Rectangle(window.getLocationOnScreen(), window.getSize()));
@@ -402 +402 @@
             Rectangle bounds = gc.getBounds();
             Insets insets = component.getToolkit().getScreenInsets(gc);
-            result.width  = bounds.width  - insets.left - insets.right;
+            result.width = bounds.width - insets.left - insets.right;
             result.height = bounds.height - insets.top - insets.bottom;
         }

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

@@ -106 +106 @@
             } else if (mapping.containsKey(qname) && characters != null && !current.isEmpty()) {
                 setValue(mapping.get(qname), qname, characters.toString().trim());
-                characters  = new StringBuilder(64);
+                characters = new StringBuilder(64);
             }
         }
@@ -117 +117 @@
         private void report() {
             queue.add(current.pop());
-            characters  = new StringBuilder(64);
+            characters = new StringBuilder(64);
         }
 

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

@@ -108 +108 @@
 
             Token token = tokenizer.lookAhead();
-            if (token.getType()  == TokenType.END) {
+            if (token.getType() == TokenType.END) {
                 tokenizer.nextToken();
                 return result;