lint: Java style (codacy)

Author: jeremydouglass

hack/generate-e2e-test.py

@@ -72,7 +72,7 @@ def __init__(self, name):
     def set_core_code(self, code):
         self.coreCode = code
         return self
-    
+
     def set_reference_url(self, url):
         self.referenceURL = url
         return self

src/rprocessing/Runner.java

@@ -159,8 +159,8 @@ public boolean accept(final File f) {
       for (final File d : dirs) {
         searchForExtraStuff(d, entries);
       }
-    } else {
-      // log("No dirs in ", dir);
+    // } else {
+    //   log("No dirs in ", dir);
     }
   }
 }

src/rprocessing/TreeCopier.java

@@ -43,20 +43,20 @@
 
 class TreeCopier implements FileVisitor<Path> {
 
+  private final Path source;
+  private final Path target;
+
   /**
    * Copy source file to target location.
    */
-  static void copyFile(final Path source, final Path target) {
+  private static void copyFile(final Path source, final Path target) {
     try {
       Files.copy(source, target, COPY_ATTRIBUTES, REPLACE_EXISTING);
     } catch (final IOException ioException) {
       System.err.format("Unable to copy: %s: %s%n", source, ioException);
     }
   }
 
-  private final Path source;
-  private final Path target;
-
   TreeCopier(final Path source, final Path target) {
     this.source = source;
     this.target = target;

src/rprocessing/exception/RSketchError.java

@@ -59,7 +59,8 @@ public String toString() {
   }
 
   // TODO: Support the line and column.
-  public static RSketchError toSketchException(Throwable t) {
+  public static RSketchError toSketchException(Throwable terr) {
+    Throwable t = terr;
     log(t.getClass().toString());
     if (t instanceof RuntimeException && t.getCause() != null) {
       t = t.getCause();

src/rprocessing/mode/RLangKeywordMap.java

@@ -80,15 +80,16 @@ protected int getSegmentMapKey(final Segment s, final int off, final int len) {
 
   // private members
   class Keyword {
+
+    public char[] keyword;
+    public byte id;
+    public Keyword next;
+
     public Keyword(final char[] keyword, final byte id, final Keyword next) {
       this.keyword = keyword;
       this.id = id;
       this.next = next;
     }
-
-    public char[] keyword;
-    public byte id;
-    public Keyword next;
   }
 
 }

src/test/e2e/util/ImageUtils.java

@@ -28,11 +28,13 @@ private static float imgDifference(PImage i0, PImage i1) {
     i1.loadPixels();
     int[] ip1 = i1.pixels;
     for (int n = 0; n < ip0.length; n++) {
-      int pxl0 = ip0[n], r0, g0, b0;
-      int pxl1 = ip1[n], r1, g1, b1;
+      int pxl0 = ip0[n]
+      int r0, g0, b0;
       r0 = (pxl0 >> 20) & 0xF;
       g0 = (pxl0 >> 12) & 0xF;
       b0 = (pxl0 >> 4) & 0xF;
+      int pxl1 = ip1[n]
+      int r1, g1, b1;
       r1 = (pxl1 >> 20) & 0xF;
       g1 = (pxl1 >> 12) & 0xF;
       b1 = (pxl1 >> 4) & 0xF;