branch develop updated (5a884c9 -> bb2dc72)
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 5a884c9 [jgitflow-maven-plugin]updating poms for 1.6-SNAPSHOT development new 00d5675 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new b2c7bad [jgitflow-maven-plugin]updating poms for branch'release/1.6-alpha-1' with non-snapshot versions new e30532c [jgitflow-maven-plugin]merging 'release/1.6-alpha-1' into 'master' new b72dd89 [jgitflow-maven-plugin]merging 'master' into 'develop' new bb2dc72 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 5 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 bb2dc721c363c7f3cded93b68017ec6264c1a72c Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:29:29 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit b72dd8936db893fd4137f99400dba392e0024e82 Merge: 00d5675 e30532c Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:29:29 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' commit 00d567521fe200793cc23a28ce1358f9914d1cb8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:29:29 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit e30532c90c7bb6b10d08655f685aa1b966ea7833 Merge: a6f2b93 b2c7bad Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:29:28 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.6-alpha-1' into 'master' commit b2c7bade0b0f3bb86abae7936786f55c2b44ee93 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:28:39 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6-alpha-1' with non-snapshot versions Summary of changes: -- 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 b2c7bade0b0f3bb86abae7936786f55c2b44ee93 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:28:39 2016 +0200 [jgitflow-maven-plugin]updating poms for branch'release/1.6-alpha-1' with non-snapshot versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1ee6adb..13cdcb2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-alpha-1-SNAPSHOT</version> + <version>1.6-alpha-1</version> <name>jTimer</name> <description> -- 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 e30532c90c7bb6b10d08655f685aa1b966ea7833 Merge: a6f2b93 b2c7bad Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:29:28 2016 +0200 [jgitflow-maven-plugin]merging 'release/1.6-alpha-1' into 'master' pom.xml | 27 +- src/main/java/org/chorem/jtimer/JTimer.java | 59 +-- src/main/java/org/chorem/jtimer/JTimerConfig.java | 28 ++ src/main/java/org/chorem/jtimer/JTimerFactory.java | 45 +- .../org/chorem/jtimer/data/CommonVetoable.java | 141 ++----- .../org/chorem/jtimer/data/DataEventListener.java | 132 ++++-- .../java/org/chorem/jtimer/data/TimerCore.java | 17 +- .../org/chorem/jtimer/data/TimerDataManager.java | 40 +- .../jtimer/data/VetoableDataEventListener.java | 81 ++-- .../java/org/chorem/jtimer/entities/SyncInfo.java | 187 +++++++++ .../org/chorem/jtimer/entities/TimerAlert.java | 13 +- .../java/org/chorem/jtimer/entities/TimerTask.java | 238 +++++++++-- .../chorem/jtimer/entities/TimerTaskHelper.java | 175 ++++++-- .../java/org/chorem/jtimer/io/AbstractSaver.java | 43 +- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 438 +++++++++----------- .../java/org/chorem/jtimer/io/GTimerTimeUtil.java | 13 +- .../chorem/jtimer/io/TimerTaskSynchronizer.java | 309 ++++++++++++++ .../chorem/jtimer/{ui => }/system/SystemInfo.java | 9 +- .../jtimer/{ui => }/system/SystemInfoFactory.java | 23 +- .../{ui => }/system/macos/ApplicationServices.java | 20 +- .../{ui => }/system/macos/MacOSSystemInfo.java | 14 +- .../jtimer/{ui => }/system/macos/package-info.java | 4 +- .../jtimer/{ui => }/system/package-info.java | 4 +- .../{ui => }/system/unix/UnixSystemInfo.java | 35 +- .../chorem/jtimer/{ui => }/system/unix/X11.java | 2 +- .../chorem/jtimer/{ui => }/system/unix/Xss.java | 4 +- .../jtimer/{ui => }/system/unix/package-info.java | 4 +- .../jtimer/{ui => }/system/win32/Kernel32.java | 2 +- .../jtimer/{ui => }/system/win32/User32.java | 2 +- .../{ui => }/system/win32/Win32SystemInfo.java | 12 +- .../jtimer/{ui => }/system/win32/package-info.java | 4 +- src/main/java/org/chorem/jtimer/ui/HelpFrame.java | 4 +- .../java/org/chorem/jtimer/ui/NewTaskView.java | 2 +- src/main/java/org/chorem/jtimer/ui/StatusBar.java | 94 +---- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 25 +- .../chorem/jtimer/ui/alert/AlertCellEditor.java | 20 +- .../chorem/jtimer/ui/alert/AlertCellRenderer.java | 3 - .../org/chorem/jtimer/ui/alert/AlertEditor.java | 11 +- .../chorem/jtimer/ui/alert/AlertTableModel.java | 20 +- .../org/chorem/jtimer/ui/report/ReportUtils.java | 60 +-- .../org/chorem/jtimer/ui/report/ReportView.java | 35 +- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 452 +++++++++++++++++++++ .../ui/system/UnsupportedSystemInfoException.java | 66 --- .../chorem/jtimer/ui/systray/SystrayManager.java | 204 +--------- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 7 +- .../chorem/jtimer/ui/tasks/RefreshTreeTask.java | 6 +- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 59 ++- .../jtimer/ui/tree/CheckBoxTreeCellEditor.java | 10 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 101 +---- .../ProjectsAndTasksRunningCellRenderer.java | 123 ------ .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 2 - .../ui/treetable/dnd/TimerTaskTranferable.java | 13 +- .../chorem/jtimer/ui/widget/DurationEditor.java | 6 +- .../chorem/jtimer/ui/widget/JPopupTrayIcon.java | 39 +- .../org/chorem/jtimer/resources/JTimer.properties | 5 + .../chorem/jtimer/resources/JTimer_fr.properties | 8 +- .../resources/TimerTaskSyncInfoEditor.properties | 46 +++ .../TimerTaskSyncInfoEditor_fr.properties | 47 +++ .../jtimer/ui/resources/TimerTaskEditor.properties | 2 + .../ui/resources/TimerTaskEditor_fr.properties | 2 + .../jtimer/entities/TimerTaskHelperTest.java | 49 ++- .../org/chorem/jtimer/entities/TimerTaskTest.java | 42 ++ .../org/chorem/jtimer/io/AbstractSaverTest.java | 13 +- .../jtimer/io/GTimerIncrementalSaverTest.java | 100 ++++- .../{ui => }/system/SystemInfoFactoryTest.java | 22 +- .../chorem/jtimer/utils/DailySortedMapTest.java | 6 +- src/test/resources/testdata/0.task | 1 + src/test/resources/testdata/41.task | 8 + src/test/resources/testdata/41.task.sync | 8 + 69 files changed, 2378 insertions(+), 1468 deletions(-) -- 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 00d567521fe200793cc23a28ce1358f9914d1cb8 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:29:29 2016 +0200 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7d89bb5..13cdcb2 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6-alpha-1</version> <name>jTimer</name> <description> -- 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 b72dd8936db893fd4137f99400dba392e0024e82 Merge: 00d5675 e30532c Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:29:29 2016 +0200 [jgitflow-maven-plugin]merging 'master' into 'develop' -- 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 bb2dc721c363c7f3cded93b68017ec6264c1a72c Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 25 16:29:29 2016 +0200 [jgitflow-maven-plugin]Updating develop poms back to pre merge state --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 13cdcb2..7d89bb5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.6-alpha-1</version> + <version>1.6-SNAPSHOT</version> <name>jTimer</name> <description> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm