From 04627d7473e4ea21d6ecd950cbb3fdd6fa249429 Mon Sep 17 00:00:00 2001 From: ninioe Date: Mon, 18 Jul 2016 09:48:11 +0300 Subject: commented out code and unnecessary comments --- src/org/traccar/Main.java | 5 ++--- src/org/traccar/database/DataManager.java | 2 +- web/app/view/Devices.js | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/org/traccar/Main.java b/src/org/traccar/Main.java index 0070904ab..45374ca15 100644 --- a/src/org/traccar/Main.java +++ b/src/org/traccar/Main.java @@ -21,8 +21,8 @@ import java.util.TimerTask; import java.util.Locale; public final class Main { - static final long cleanDelay = 10*1000; //10 sec - static final long cleanPeriod = 24*60*60*1000; //24 hr + static final long cleanDelay = 10*1000; + static final long cleanPeriod = 24*60*60*1000; private Main() { } @@ -42,7 +42,6 @@ public final class Main { timer.scheduleAtFixedRate(new TimerTask() { @Override public void run() { - // Clean positions history try { Context.getDataManager().clearPositionsHistory(); } catch (Exception error) { diff --git a/src/org/traccar/database/DataManager.java b/src/org/traccar/database/DataManager.java index 239fc1930..bdd2e9adf 100644 --- a/src/org/traccar/database/DataManager.java +++ b/src/org/traccar/database/DataManager.java @@ -541,7 +541,7 @@ public class DataManager implements IdentityManager { Date lastUpdate = device.getLastUpdate(); if(lastUpdate != null){ - Date dateBefore = new Date(lastUpdate.getTime() - histDays * 24 * 3600 * 1000 ); //Subtract histDays days + Date dateBefore = new Date(lastUpdate.getTime() - histDays * 24 * 3600 * 1000 ); //String dt = s.format(dateBefore); QueryBuilder.create(dataSource, sql) diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js index b6e7d6ffd..77d796b1e 100644 --- a/web/app/view/Devices.js +++ b/web/app/view/Devices.js @@ -68,11 +68,9 @@ Ext.define('Traccar.view.Devices', { toggle: function(button, pressed){ if(pressed){ button.setGlyph('xf0a2@FontAwesome'); - //Ext.getCmp('useAlarmSoundButton').enable(); } else { button.setGlyph('xf1f7@FontAwesome'); - //Ext.getCmp('useAlarmSoundButton').disable(); } }, scope:this -- cgit v1.2.3