From 4e9d3d90eba620e6b84dba6d0dc4aaff77450d5d Mon Sep 17 00:00:00 2001 From: afischerdev Date: Tue, 16 May 2023 10:35:41 +0200 Subject: [PATCH] re formatting entry point --- .../src/main/java/btools/router/RoutingEngine.java | 7 +++---- .../src/main/java/btools/routingapp/BRouterWorker.java | 4 ++-- .../src/main/java/btools/server/RouteServer.java | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/brouter-core/src/main/java/btools/router/RoutingEngine.java b/brouter-core/src/main/java/btools/router/RoutingEngine.java index 8156f2c..41e99f2 100644 --- a/brouter-core/src/main/java/btools/router/RoutingEngine.java +++ b/brouter-core/src/main/java/btools/router/RoutingEngine.java @@ -81,12 +81,11 @@ public class RoutingEngine extends Thread { public RoutingEngine(String outfileBase, String logfileBase, File segmentDir, List waypoints, RoutingContext rc) { - this(0, outfileBase, logfileBase, segmentDir, - waypoints, rc); + this(outfileBase, logfileBase, segmentDir, waypoints, rc, 0); } - public RoutingEngine(int engineMode, String outfileBase, String logfileBase, File segmentDir, - List waypoints, RoutingContext rc) { + public RoutingEngine(String outfileBase, String logfileBase, File segmentDir, + List waypoints, RoutingContext rc, int engineMode) { this.segmentDir = segmentDir; this.outfileBase = outfileBase; this.logfileBase = logfileBase; diff --git a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java index a630599..a341920 100644 --- a/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java +++ b/brouter-routing-app/src/main/java/btools/routingapp/BRouterWorker.java @@ -152,7 +152,7 @@ public class BRouterWorker { } catch (Exception e) { } - RoutingEngine cr = new RoutingEngine(engineMode, null, null, segmentDir, waypoints, rc); + RoutingEngine cr = new RoutingEngine(null, null, segmentDir, waypoints, rc, engineMode); cr.quite = true; cr.doRun(maxRunningTime); @@ -248,7 +248,7 @@ public class BRouterWorker { } private List readLonlats(Bundle params, int mode) { - List wplist = new ArrayList(); + List wplist = new ArrayList<>(); String lonLats = params.getString("lonlats"); if (lonLats == null) throw new IllegalArgumentException("lonlats parameter not set"); diff --git a/brouter-server/src/main/java/btools/server/RouteServer.java b/brouter-server/src/main/java/btools/server/RouteServer.java index cd5cef3..ce1f622 100644 --- a/brouter-server/src/main/java/btools/server/RouteServer.java +++ b/brouter-server/src/main/java/btools/server/RouteServer.java @@ -213,7 +213,7 @@ public class RouteServer extends Thread implements Comparable { } } } - cr = new RoutingEngine(engineMode, null, null, serviceContext.segmentDir, wplist, rc); + cr = new RoutingEngine(null, null, serviceContext.segmentDir, wplist, rc, engineMode); cr.quite = true; cr.doRun(maxRunningTime);