Merge pull request #482 from zod/checkstyle-android

Enable checkstyle for brouter-routing-app

.editorconfig

@@ -3,6 +3,7 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
+trim_trailing_whitespace = true
 
 [*.java]
 indent_style = space

brouter-core/src/test/java/btools/router/OsmNogoPolygonTest.java

@@ -11,7 +11,6 @@ import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import btools.router.OsmNogoPolygon.Point;
 import btools.util.CheapRuler;
 
 public class OsmNogoPolygonTest {
@@ -77,9 +76,9 @@ public class OsmNogoPolygonTest {
 
   @Test
   public void testIsWithin() {
-    double[] plons = {0.0, 0.5, 1.0, -1.5, -0.5, 1.0, 1.0, 0.5, 0.5, 0.5,};
+    double[] plons = {0.0, 0.5, 1.0, -1.5, -0.5, 1.0, 1.0, 0.5, 0.5, 0.5};
-    double[] plats = {0.0, 1.5, 0.0, 0.5, -1.5, -1.0, -0.1, -0.1, 0.0, 0.1,};
+    double[] plats = {0.0, 1.5, 0.0, 0.5, -1.5, -1.0, -0.1, -0.1, 0.0, 0.1};
-    boolean[] within = {true, false, false, false, false, true, true, true, true, true,};
+    boolean[] within = {true, false, false, false, false, true, true, true, true, true};
 
     for (int i = 0; i < plons.length; i++) {
       assertEquals("(" + plons[i] + "," + plats[i] + ")", within[i], polygon.isWithin(toOsmLon(plons[i], OFFSET_X), toOsmLat(plats[i], OFFSET_Y)));

brouter-routing-app/build.gradle

@@ -101,6 +101,16 @@ dependencies {
     androidTestImplementation 'androidx.work:work-testing:2.7.1'
 }
 
+check.dependsOn 'checkstyle'
+
+task checkstyle(type: Checkstyle) {
+    source 'src'
+    include '**/*.java'
+    exclude '**/gen/**'
+
+    classpath = files()
+}
+
 task generateProfiles(type: Exec) {
     commandLine = "../misc/scripts/generate_profile_variants.sh"
 }

brouter-routing-app/src/main/java/btools/routingapp/BRouterActivity.java

@@ -96,31 +96,31 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
         return builder.create();
       case DIALOG_MAINACTION_ID:
         builder.setTitle("Select Main Action");
-        builder
+        builder.setItems(
-          .setItems(new String[]
+            new String[] { "Download Manager", "BRouter App" },
-              {"Download Manager", "BRouter App"}, new DialogInterface.OnClickListener() {
+            new DialogInterface.OnClickListener() {
               public void onClick(DialogInterface dialog, int item) {
                 if (item == 0)
                   startDownloadManager();
                 else
                   showDialog(DIALOG_SELECTPROFILE_ID);
               }
-            }
+            })
-          )
             .setNegativeButton("Close", new DialogInterface.OnClickListener() {
               public void onClick(DialogInterface dialog, int id) {
                 finish();
               }
-            }
+            });
-          );
         return builder.create();
       case DIALOG_SHOW_DM_INFO_ID:
         builder
             .setTitle("BRouter Download Manager")
             .setMessage(
                 "*** Attention: ***\n\n" + "The Download Manager is used to download routing-data "
-              + "files which can be up to 170MB each. Do not start the Download Manager " + "on a cellular data connection without a data plan! "
+                    + "files which can be up to 170MB each. Do not start the Download Manager "
-              + "Download speed is restricted to 16 MBit/s.").setPositiveButton("I know", new DialogInterface.OnClickListener() {
+                    + "on a cellular data connection without a data plan! "
+                    + "Download speed is restricted to 16 MBit/s.")
+            .setPositiveButton("I know", new DialogInterface.OnClickListener() {
               public void onClick(DialogInterface dialog, int id) {
                 Intent intent = new Intent(BRouterActivity.this, BInstallerActivity.class);
                 startActivity(intent);
@@ -139,7 +139,8 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
                 "You successfully repeated a calculation that previously run into a timeout "
                     + "when started from your map-tool. If you repeat the same request from your "
                     + "maptool, with the exact same destination point and a close-by starting point, "
-              + "this request is guaranteed not to time out.").setNegativeButton("Exit", new DialogInterface.OnClickListener() {
+                    + "this request is guaranteed not to time out.")
+            .setNegativeButton("Exit", new DialogInterface.OnClickListener() {
               public void onClick(DialogInterface dialog, int id) {
                 finish();
               }
@@ -149,7 +150,8 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
         builder
             .setTitle("Local setup needs reset")
             .setMessage(
-            "You are currently using an old version of the lookup-table " + "together with routing data made for this old table. "
+                "You are currently using an old version of the lookup-table "
+                    + "together with routing data made for this old table. "
                     + "Before downloading new datafiles made for the new table, "
                     + "you have to reset your local setup by 'moving away' (or deleting) "
                     + "your <basedir>/brouter directory and start a new setup by calling the " + "BRouter App again.")
@@ -161,7 +163,8 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
         return builder.create();
       case DIALOG_ROUTINGMODES_ID:
         builder.setTitle(message);
-        builder.setMultiChoiceItems(routingModes, routingModesChecked, new DialogInterface.OnMultiChoiceClickListener() {
+        builder.setMultiChoiceItems(routingModes, routingModesChecked,
+            new DialogInterface.OnMultiChoiceClickListener() {
               @Override
               public void onClick(DialogInterface dialog, int which, boolean isChecked) {
                 routingModesChecked[which] = isChecked;
@@ -174,7 +177,11 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
         });
         return builder.create();
       case DIALOG_EXCEPTION_ID:
-        builder.setTitle("An Error occured").setMessage(errorMessage).setPositiveButton("OK", new DialogInterface.OnClickListener() {
+        builder
+            .setTitle("An Error occured")
+            .setMessage(errorMessage)
+            .setPositiveButton("OK",
+                new DialogInterface.OnClickListener() {
                   public void onClick(DialogInterface dialog, int id) {
                     mBRouterView.continueProcessing();
                   }
@@ -214,7 +221,8 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
         return builder.create();
       case DIALOG_VIASELECT_ID:
         builder.setTitle("Check VIA Selection:");
-        builder.setMultiChoiceItems(availableVias, getCheckedBooleanArray(availableVias.length), new DialogInterface.OnMultiChoiceClickListener() {
+        builder.setMultiChoiceItems(availableVias, getCheckedBooleanArray(availableVias.length),
+            new DialogInterface.OnMultiChoiceClickListener() {
               @Override
               public void onClick(DialogInterface dialog, int which, boolean isChecked) {
                 if (isChecked) {
@@ -237,7 +245,8 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
         for (int i = 0; i < nogoList.size(); i++)
           nogoNames[i] = nogoList.get(i).name;
         final boolean[] nogoEnabled = getCheckedBooleanArray(nogoList.size());
-        builder.setMultiChoiceItems(nogoNames, getCheckedBooleanArray(nogoNames.length), new DialogInterface.OnMultiChoiceClickListener() {
+        builder.setMultiChoiceItems(nogoNames, getCheckedBooleanArray(nogoNames.length),
+            new DialogInterface.OnMultiChoiceClickListener() {
               @Override
               public void onClick(DialogInterface dialog, int which, boolean isChecked) {
                 nogoEnabled[which] = isChecked;
@@ -293,7 +302,11 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
 
         return builder.create();
       case DIALOG_MODECONFIGOVERVIEW_ID:
-        builder.setTitle("Success").setMessage(message).setPositiveButton("Exit", new DialogInterface.OnClickListener() {
+        builder
+            .setTitle("Success")
+            .setMessage(message)
+            .setPositiveButton("Exit",
+                new DialogInterface.OnClickListener() {
                   public void onClick(DialogInterface dialog, int id) {
                     finish();
                   }
@@ -345,7 +358,8 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
       try {
         StatFs stat = new StatFs(f.getAbsolutePath());
         size = (long) stat.getAvailableBlocks() * stat.getBlockSize();
-      } catch (Exception e) { /* ignore */ }
+      } catch (Exception e) {
+        /* ignore */ }
       dirFreeSizes.add(size);
     }
 
@@ -358,7 +372,8 @@ public class BRouterActivity extends AppCompatActivity implements ActivityCompat
     int bdidx = 0;
     DecimalFormat df = new DecimalFormat("###0.00");
     for (int idx = 0; idx < availableBasedirs.size(); idx++) {
-      basedirOptions[bdidx++] = availableBasedirs.get(idx) + " (" + df.format(dirFreeSizes.get(idx) / 1024. / 1024. / 1024.) + " GB free)";
+      basedirOptions[bdidx++] = availableBasedirs.get(idx) + " ("
+          + df.format(dirFreeSizes.get(idx) / 1024. / 1024. / 1024.) + " GB free)";
     }
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
       basedirOptions[bdidx] = "Enter path manually";

brouter-routing-app/src/main/java/btools/routingapp/BRouterService.java

@@ -1,6 +1,5 @@
 package btools.routingapp;
 
-
 import android.app.Service;
 import android.content.Intent;
 import android.os.Bundle;
@@ -49,7 +48,8 @@ public class BRouterService extends Service {
         baseDir = br.readLine();
       } catch (Exception e) {
       } finally {
-        if (configInput != null) try {
+        if (configInput != null)
+          try {
             configInput.close();
           } catch (Exception ee) {
           }
@@ -137,7 +137,8 @@ public class BRouterService extends Service {
       } catch (Exception e) {
         return "no brouter service config found, mode " + mode_key;
       } finally {
-        if (br != null) try {
+        if (br != null)
+          try {
             br.close();
           } catch (Exception ee) {
           }
@@ -163,7 +164,8 @@ public class BRouterService extends Service {
             os = new FileOutputStream(profileFile);
             os.write(profileBytes);
           } finally {
-            if (os != null) try {
+            if (os != null)
+              try {
                 os.close();
               } catch (IOException io) {
               }
@@ -182,7 +184,6 @@ public class BRouterService extends Service {
       worker.nogoPolygonsList = new ArrayList<OsmNodeNamed>();
     }
 
-
     private boolean fileEqual(byte[] fileBytes, File file) throws Exception {
       if (!file.exists()) {
         return false;
@@ -196,8 +197,10 @@ public class BRouterService extends Service {
         is = new FileInputStream(file);
         while (pos < nbytes) {
           int len = is.read(buf, 0, blen);
-          if (len <= 0) return false;
+          if (len <= 0)
-          if (pos + len > nbytes) return false;
+            return false;
+          if (pos + len > nbytes)
+            return false;
           for (int j = 0; j < len; j++) {
             if (fileBytes[pos++] != buf[j]) {
               return false;
@@ -206,7 +209,8 @@ public class BRouterService extends Service {
         }
         return true;
       } finally {
-        if (is != null) try {
+        if (is != null)
+          try {
             is.close();
           } catch (IOException io) {
           }
@@ -215,7 +219,8 @@ public class BRouterService extends Service {
 
     private String checkForTestDummy(String baseDir) {
       File testdummy = new File(baseDir + "/brouter/profiles2/remotetestdummy.brf");
-      if (!testdummy.exists()) return null;
+      if (!testdummy.exists())
+        return null;
       BufferedReader br = null;
       StringBuilder sb = new StringBuilder();
       try {
@@ -230,7 +235,8 @@ public class BRouterService extends Service {
       } catch (Exception e) {
         throw new RuntimeException("error reading " + testdummy);
       } finally {
-        if (br != null) try {
+        if (br != null)
+          try {
             br.close();
           } catch (Exception ee) {
           }
@@ -261,7 +267,6 @@ public class BRouterService extends Service {
     Log.d(getClass().getSimpleName(), "onDestroy()");
   }
 
-
   // This is the old onStart method that will be called on the pre-2.0
   // platform. On 2.0 or later we override onStartCommand() so this
   // method will not be called.

config/checkstyle/checkstyle.xml

@@ -17,5 +17,12 @@
       <property name="throwsIndent" value="2" />
       <property name="lineWrappingIndentation" value="2" />
     </module>
+
+    <module name="ParenPad" />
+    <module name="NoWhitespaceBefore">
+      <property name="allowLineBreaks" value="true" />
+    </module>
+    <module name="WhitespaceAfter" />
+
   </module>
 </module>