This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 2a0e547cd4b5b4bfb4f55179b3c15ca694379e63 Author: servantie <servantie.c@gmail.com> Date: Mon Jun 20 16:45:26 2016 +0200 minor cleanup in methods --- .../java/org/chorem/jtimer/entities/SyncInfo.java | 2 +- .../java/org/chorem/jtimer/entities/TimerTask.java | 14 ++++++------ .../chorem/jtimer/entities/TimerTaskHelper.java | 7 +++--- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 2 +- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 2 +- .../jtimer/ui/report/TimerTaskUpdaterView.java | 25 +++++++++------------- 6 files changed, 25 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/SyncInfo.java b/src/main/java/org/chorem/jtimer/entities/SyncInfo.java index d5d9e00..cf81350 100644 --- a/src/main/java/org/chorem/jtimer/entities/SyncInfo.java +++ b/src/main/java/org/chorem/jtimer/entities/SyncInfo.java @@ -54,7 +54,7 @@ public class SyncInfo { * Sets the isActiveSync boolean * @param isActive boolean */ - public void setActiveSync(boolean isActive) { + public void isActiveSync(boolean isActive) { isActiveSync = isActive; } diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTask.java b/src/main/java/org/chorem/jtimer/entities/TimerTask.java index 1cb4755..be6b5c7 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTask.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTask.java @@ -270,13 +270,13 @@ public class TimerTask implements Cloneable, * @return the URL List */ public List<String> getSynchronizingURLList() { - List<String> resutList = new ArrayList<>(); + List<String> resultList = new ArrayList<>(); if (!synchronisingInfoList.isEmpty()) { for (SyncInfo sync : synchronisingInfoList) { - resutList.add(sync.getSyncURL()); + resultList.add(sync.getSyncURL()); } } - return resutList; + return resultList; } /** @@ -305,8 +305,10 @@ public class TimerTask implements Cloneable, * @param isActive a boolean for activity (true to sync auto) */ public void addSyncInfo(String url, LocalDateTime time, boolean isActive) { - if (!getSynchronizingURLList().contains(url)) { - synchronisingInfoList.add(new SyncInfo(url, time, isActive)); + if (!url.isEmpty()) { + if (!getSynchronizingURLList().contains(url)) { + synchronisingInfoList.add(new SyncInfo(url, time, isActive)); + } } } @@ -360,7 +362,7 @@ public class TimerTask implements Cloneable, * @param syncInfo the SyncInfo */ public void setIsActive(boolean isActive, SyncInfo syncInfo) { - syncInfo.setActiveSync(isActive); + syncInfo.isActiveSync(isActive); } /** diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index 75759ef..09128d2 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -359,6 +359,7 @@ public class TimerTaskHelper { public static List<JsonObject> taskToJSONFormat(TimerTask task, Date startDate, Date endDate, boolean withAnnotations, String timezone) { ArrayList<JsonObject> jsonObjectList = new ArrayList<>(); + String timestamp = "T00:00:00"; for (String url : task.getSynchronizingURLList()) { boolean isActive = task.getSynchronizingInfo(url).getActiveSync(); @@ -378,7 +379,7 @@ public class TimerTaskHelper { //as jtimer has time entries only for a day, the id of the times will be the date in yyyy-mm-dd format JsonObject periodElement = new JsonObject(); periodElement.addProperty("id", dateString); - periodElement.addProperty("startDate", dateString + "T00:00:00" + timezone); + periodElement.addProperty("startDate", dateString + timestamp + timezone); periodElement.addProperty("duration", entry.getValue()/1000); if (withAnnotations && !(getAnnotation(task, entry.getKey()).isEmpty())) { StringBuilder builder = new StringBuilder(); @@ -394,8 +395,8 @@ public class TimerTaskHelper { } } responseJSON.addProperty("URL", url); - responseJSON.addProperty("startDate", startPeriodDate.toString() + "T00:00:00" + timezone); - responseJSON.addProperty("endDate", endPeriodDate.toString() + "T00:00:00" + timezone); + responseJSON.addProperty("startDate", startPeriodDate.toString() + timestamp + timezone); + responseJSON.addProperty("endDate", endPeriodDate.toString() + timestamp + timezone); responseJSON.add("periods", periodArray); jsonObjectList.add(responseJSON); diff --git a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java index b427531..79be028 100644 --- a/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java +++ b/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java @@ -622,7 +622,7 @@ public class GTimerIncrementalSaver extends AbstractSaver implements Saver, String line = parseIn.readLine(); while ((line = parseIn.readLine()) != null) { line = line.trim(); - if ((!line.isEmpty())) { + if (!line.isEmpty()) { String[] urlArray = line.split(" "); //if there is no lastSyncTime if (urlArray.length == 2) { diff --git a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java index 51bcde0..ea3660c 100644 --- a/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java +++ b/src/main/java/org/chorem/jtimer/io/TimerTaskSynchronizer.java @@ -122,7 +122,7 @@ public class TimerTaskSynchronizer implements DataEventListener { else { log.debug("Sync failed on " + object.get("URL").getAsString()); //deactivate autosync if the sync failed - task.getSynchronizingInfo(object.get("URL").getAsString()).setActiveSync(false); + task.getSynchronizingInfo(object.get("URL").getAsString()).isActiveSync(false); log.info("Adress deactivated"); } diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java index 7220cb6..bc20e94 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskUpdaterView.java @@ -82,7 +82,7 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener, /** ComboBox of URLs */ protected JComboBox<String> urlComboBox; - /** LastSync */ + /** LastSync */ protected JLabel lastUpdate; /** task to update */ @@ -204,6 +204,8 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener, for (String url : task.getSynchronizingURLList()) { urlComboBox.addItem(url); } + + urlComboBox.setActionCommand("comboBox"); panelOption.add(urlcomboBoxLabel, new GridBagConstraints(1,3,1,1,0,0, GridBagConstraints.WEST, GridBagConstraints.VERTICAL, new Insets(3,1,1,1), 0, 0)); panelOption.add(urlComboBox, new GridBagConstraints(2,3,1,1,0,0, @@ -386,14 +388,13 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener, builder.append(gson.toJson(object)); } } - updateArea.setText(builder.toString()); -// if (task.getSynchronizingInfo(urlSelected).getLastSync().isAfter(LocalDateTime.MIN)) { -// lastUpdate.setText(task.getSynchronizingInfo(urlSelected).getLastSync().toString()); -// } -// else { -// lastUpdate.setText(""); -// } - + if (!task.getSynchronizingInfo(urlSelected).getActiveSync()) { + //todo : get in properties + updateArea.setText("Url inactive"); + } + else { + updateArea.setText(builder.toString()); + } } else { updateArea.setText("No data"); @@ -442,12 +443,6 @@ public class TimerTaskUpdaterView extends FrameView implements DocumentListener, if (urlSelected.equals(object.get("URL").getAsString())) { synchronizeTaskOnURL(task, object); } -// } -// if (task.getSynchronizingInfo(urlSelected).getLastSync().isAfter(LocalDateTime.MIN)) { -// lastUpdate.setText(task.getSynchronizingInfo(urlSelected).getLastSync().toString()); -// } -// else { -// lastUpdate.setText(""); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.