branch develop updated (e20e86e -> e4c1d77)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from e20e86e fixes #1359 Revert modification to allow running multiple task at the same time new e4c1d77 Fix release The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit e4c1d775aecbb584c2b213587432248f7d2e0478 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Aug 4 17:13:53 2016 +0200 Fix release Summary of changes: .../java/org/chorem/jtimer/io/BackupUtils.java | 21 ++++++++++++++++++ .../jtimer/plugin/timebundle/TimeBundleHelper.java | 4 ++-- .../jtimer/plugin/timebundle/TimeBundleSaver.java | 7 +++--- .../plugin/timebundle/TimeBundleSynchronizer.java | 4 ++-- .../plugin/timebundle/TimeBundleVetoable.java | 4 ++-- .../plugin/timebundle/TimerSyncCellRenderer.java | 4 ++-- .../jtimer/plugin/timebundle/TimerSyncEditor.java | 4 ++-- .../plugin/timebundle/TimerSyncTableModel.java | 4 ++-- ...ndleSaverTest.java => TimeBundleSaverTest.java} | 25 ++++++++++++++++++++-- 9 files changed, 59 insertions(+), 18 deletions(-) rename src/test/java/org/chorem/jtimer/plugin/timebundle/{TImeBundleSaverTest.java => TimeBundleSaverTest.java} (56%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit e4c1d775aecbb584c2b213587432248f7d2e0478 Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Aug 4 17:13:53 2016 +0200 Fix release --- .../java/org/chorem/jtimer/io/BackupUtils.java | 21 ++++++++++++++++++ .../jtimer/plugin/timebundle/TimeBundleHelper.java | 4 ++-- .../jtimer/plugin/timebundle/TimeBundleSaver.java | 7 +++--- .../plugin/timebundle/TimeBundleSynchronizer.java | 4 ++-- .../plugin/timebundle/TimeBundleVetoable.java | 4 ++-- .../plugin/timebundle/TimerSyncCellRenderer.java | 4 ++-- .../jtimer/plugin/timebundle/TimerSyncEditor.java | 4 ++-- .../plugin/timebundle/TimerSyncTableModel.java | 4 ++-- ...ndleSaverTest.java => TimeBundleSaverTest.java} | 25 ++++++++++++++++++++-- 9 files changed, 59 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/io/BackupUtils.java b/src/main/java/org/chorem/jtimer/io/BackupUtils.java index 58d0305..1f65181 100644 --- a/src/main/java/org/chorem/jtimer/io/BackupUtils.java +++ b/src/main/java/org/chorem/jtimer/io/BackupUtils.java @@ -1,3 +1,24 @@ +/*- + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2016 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.io; import org.apache.commons.io.FileUtils; diff --git a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleHelper.java b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleHelper.java index 7b3d9ba..e07c342 100644 --- a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleHelper.java +++ b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleHelper.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. diff --git a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaver.java b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaver.java index 47e0d41..2fb40ed 100644 --- a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaver.java +++ b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaver.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. @@ -27,7 +27,6 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; -import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.JTimer; @@ -171,7 +170,7 @@ public class TimeBundleSaver implements DataEventListener { protected void saveFileSync(TimerTask task, File taskSyncFile) { - if (CollectionUtils.isEmpty(task.getSyncs())) { + if (task.getSyncs() == null || task.getSyncs().isEmpty()) { taskSyncFile.delete(); } else { diff --git a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSynchronizer.java b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSynchronizer.java index f27bf47..95ab70a 100644 --- a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSynchronizer.java +++ b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSynchronizer.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. diff --git a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleVetoable.java b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleVetoable.java index 8a2c323..be887fc 100644 --- a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleVetoable.java +++ b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimeBundleVetoable.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. diff --git a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncCellRenderer.java b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncCellRenderer.java index 87efc37..f316bdf 100644 --- a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncCellRenderer.java +++ b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncCellRenderer.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. diff --git a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncEditor.java b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncEditor.java index ad70964..d69b55e 100644 --- a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncEditor.java +++ b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncEditor.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. diff --git a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncTableModel.java b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncTableModel.java index 286d30f..d603504 100644 --- a/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncTableModel.java +++ b/src/main/java/org/chorem/jtimer/plugin/timebundle/TimerSyncTableModel.java @@ -8,12 +8,12 @@ * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. diff --git a/src/test/java/org/chorem/jtimer/plugin/timebundle/TImeBundleSaverTest.java b/src/test/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaverTest.java similarity index 56% rename from src/test/java/org/chorem/jtimer/plugin/timebundle/TImeBundleSaverTest.java rename to src/test/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaverTest.java index 733ec82..06708ec 100644 --- a/src/test/java/org/chorem/jtimer/plugin/timebundle/TImeBundleSaverTest.java +++ b/src/test/java/org/chorem/jtimer/plugin/timebundle/TimeBundleSaverTest.java @@ -1,3 +1,24 @@ +/*- + * #%L + * jTimer + * %% + * Copyright (C) 2007 - 2016 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.plugin.timebundle; import org.chorem.jtimer.AbstractJTimerTest; @@ -11,9 +32,9 @@ import java.io.IOException; import java.util.Collections; /** - * Created by chatellier on 02/08/16. + * Test class for TimeBundleSaver. */ -public class TImeBundleSaverTest extends AbstractJTimerTest { +public class TimeBundleSaverTest extends AbstractJTimerTest { protected TimeBundleSaver saver; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm