diff options
Diffstat (limited to 'src/org/traccar/helper')
| -rw-r--r-- | src/org/traccar/helper/DistanceCalculator.java | 9 | ||||
| -rw-r--r-- | src/org/traccar/helper/Log.java | 31 |
2 files changed, 23 insertions, 17 deletions
diff --git a/src/org/traccar/helper/DistanceCalculator.java b/src/org/traccar/helper/DistanceCalculator.java index 7ba5044bc..d191a27af 100644 --- a/src/org/traccar/helper/DistanceCalculator.java +++ b/src/org/traccar/helper/DistanceCalculator.java @@ -15,7 +15,10 @@ */ package org.traccar.helper; -public class DistanceCalculator { +public final class DistanceCalculator { + + private DistanceCalculator() { + } private static final double EQUATORIAL_EARTH_RADIUS = 6378.1370; private static final double DEG_TO_RAD = Math.PI / 180; @@ -23,8 +26,8 @@ public class DistanceCalculator { public static double distance(double lat1, double lon1, double lat2, double lon2) { double dlong = (lon2 - lon1) * DEG_TO_RAD; double dlat = (lat2 - lat1) * DEG_TO_RAD; - double a = Math.pow(Math.sin(dlat / 2), 2) + - Math.cos(lat1 * DEG_TO_RAD) * Math.cos(lat2 * DEG_TO_RAD) * Math.pow(Math.sin(dlong / 2), 2); + double a = Math.pow(Math.sin(dlat / 2), 2) + + Math.cos(lat1 * DEG_TO_RAD) * Math.cos(lat2 * DEG_TO_RAD) * Math.pow(Math.sin(dlong / 2), 2); double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a)); double d = EQUATORIAL_EARTH_RADIUS * c; return d * 1000; diff --git a/src/org/traccar/helper/Log.java b/src/org/traccar/helper/Log.java index f344a4a93..0e55a5445 100644 --- a/src/org/traccar/helper/Log.java +++ b/src/org/traccar/helper/Log.java @@ -35,7 +35,10 @@ import org.jboss.netty.logging.InternalLogger; import org.jboss.netty.logging.InternalLoggerFactory; import org.traccar.Config; -public class Log { +public final class Log { + + private Log() { + } private static final String LOGGER_NAME = "traccar"; @@ -81,24 +84,24 @@ public class Log { public static void logSystemInfo() { try { OperatingSystemMXBean operatingSystemBean = ManagementFactory.getOperatingSystemMXBean(); - Log.info("Operating system" + - " name: " + operatingSystemBean.getName() + - " version: " + operatingSystemBean.getVersion() + - " architecture: " + operatingSystemBean.getArch()); + Log.info("Operating system" + + " name: " + operatingSystemBean.getName() + + " version: " + operatingSystemBean.getVersion() + + " architecture: " + operatingSystemBean.getArch()); RuntimeMXBean runtimeBean = ManagementFactory.getRuntimeMXBean(); - Log.info("Java runtime" + - " name: " + runtimeBean.getVmName() + - " vendor: " + runtimeBean.getVmVendor() + - " version: " + runtimeBean.getVmVersion()); + Log.info("Java runtime" + + " name: " + runtimeBean.getVmName() + + " vendor: " + runtimeBean.getVmVendor() + + " version: " + runtimeBean.getVmVersion()); MemoryMXBean memoryBean = ManagementFactory.getMemoryMXBean(); - Log.info("Memory limit" + - " heap: " + memoryBean.getHeapMemoryUsage().getMax() / (1024 * 1024) + "mb" + - " non-heap: " + memoryBean.getNonHeapMemoryUsage().getMax() / (1024 * 1024) + "mb"); + Log.info("Memory limit" + + " heap: " + memoryBean.getHeapMemoryUsage().getMax() / (1024 * 1024) + "mb" + + " non-heap: " + memoryBean.getNonHeapMemoryUsage().getMax() / (1024 * 1024) + "mb"); - Log.info("Character encoding: " + - System.getProperty("file.encoding") + " charset: " + Charset.defaultCharset()); + Log.info("Character encoding: " + + System.getProperty("file.encoding") + " charset: " + Charset.defaultCharset()); } catch (Exception error) { Log.warning("Failed to get system info"); |