branch master updated (1d6a5d3 -> a6f2b93)
This is an automated email from the git hooks/post-receive script. New change to branch master in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 1d6a5d3 [maven-release-plugin] copy for tag jtimer-1.4.3 adds 415aa4f [maven-release-plugin] prepare for next development iteration adds 38b5e93 fix jnlp config adds 194e9eb fixes #957: Updates to mavenpom 4.2 fixes #956: Make webstart starts more friendly adds ba6adbb fixes #958: Updates jna to 4.0.0 fixes #959: Updates freemarker to 2.3.20 fixes #960: Updates testng to 6.8.7 adds ecae970 fixes #983: Add report option to include intermediate total time adds 908849a fixes #984: updates nuiton-config to 3.0-alpha-2 fixes #985: updates commons-collections to 4.0 fixes #957: Updates mavenpom to 4.7 adds 542af10 fixes #1128: Migrates to git adds 2ef4274 fixes #1128: Migrates to git adds d39cba3 fixes #1128: Migrates to git adds a32e051 refs #956: Make webstart starts more friendly (fix jnlp url) adds 112ca20 fixes #1128: Migrates to git (fix multilang site urls) adds 6b1b97c Fix gitignore adds 256fdc1 fixes #1320: Update libs adds ba3d26f Update dates adds 61638af Set min jre to 1.7 adds b5e5e00 Fix java-webstart build on jdk 8 adds 0436921 Bump version adds fb6fa54 fixes #1323: Remove xmlrpc web service layer adds 7fa8859 fixes #1322: Use java 8 api adds 7028f62 refs #1322: Use filter api instead of commons-collection adds 5e5054a refs #1322: Manage resources with auto-closeable adds 5970b85 refs #1322: Fix some warning and depreciation adds c621a55 refs #1320: Update log4j2 adds a421f5c refs #983: Fix layout adds 3ef0e1f fixes #1319: Add a way to create a tree structure from a template adds d30e4b4 Keep only en site. Update site with configuration adds 8fc814c Fix site adds 782715f Fix scm url adds 7d94fc1 fixes #1030: Edition des tâches adds 4cd90b3 Use diamond operator adds 2440743 Change scm url adds 6a17176 Change readme to markdown adds b7c0d03 Fix build adds 6cca679 fixes #779: If more than one task is running at a time, time is recorded in an accelerated manner fixes #778: Option to only have one task running at a time fixes #780: Stop all tasks button adds a78a41a fixes #1328: When idle popup is displayed, show in the popup the current running taks(s) adds e511d1c fixes #1330: Use log rotate to clean old backup adds 0cb6c6d refs #1320: Update maven-launch4j-plugin adds fac1edb Fix layout adds a8d5288 refs #1329: Use task pane to improve ui adds f8ebc46 fixes #1329: Add option to not display time in report adds 9c90026 fixes #1331: Remove dependency on jna-platform adds fda607b Exlude some unused transitive dependencies adds 67b6953 Mark DailySortedMap as deprecated adds 77c0615 Code cleanup adds 77ae6b6 Simplify maven configuration. Remove src assembly. adds ce44d31 fixes #1319: Add a way to create a tree structure from a template adds 48a11de fixes #1319: Remplace json format by yaml adds f12d21a fixes #1333: Add option to display tree angles lines adds fe462bc Update configuration adds 0c0247b Remove useless "file" menu adds 8931f5b Update parent pom adds 7b7277a fixes #880: Add the ability to assign idle time to a task. adds 618568a refs #880: Fix labels adds b1e2dc8 refs #880: Reduce idle dialog size adds 3adc7f0 Fix imports adds 5a8061e Fix en message adds 8ad5674 Fix annoying trace log on non linux system adds d1055db Fix label for next action step adds 558593b Fix gray background bug in report view adds 7a504e1 set minimum size for jsplitpane adds 2e4c406 fixes #1333: Always display lines adds 348b57b Remove unused sync project adds dd8b1cc Fix meta info for window build adds 3ca18bd Fix alert box title adds 7b1e363 Refactor task editor with saf adds 6b71e31 Remove strange char adds 3003962 Replace GBL by grid layout (better visual effect) adds 8ea45d4 Improve index page adds 5f9877e fixes #1341: Double click on a running should stop it adds a06bbaf fixes #1338: Can't start with webstart adds a804120 fixes #1337: When creating a new task, focus is not ok fixes #1340: I cancel the creation of a new task, but it is still created adds 9cc764a fixes #1339: Check the template directory exists (or create it at launch time ?) adds a81f77c fixes #1342: Can't delete multi selected tasks adds 379206f fixes #1343: When éditing a task, please do not recompute the tree structure at the end adds 7665124 Fix var adds 2d230f8 Introduce DialogView to use proper modal view adds 286e8da Fix image location adds d0a24f1 Add athimel as a developer adds b413336 Merge branch 'feature/feature/toto' into 'develop' adds beb748c refs: #1319: Fix dialog non resizable adds 537de1f fixes #1347: Enable "Enter" key support on main popups adds d72f1f6 Update jna adds 66a5144 fixes #1348: After creating a task, set the focus on this new task adds 2830943 fixes #1319: Migrate gtimer directory to new jtimer directories structure adds cadc942 Update parent pom adds 45091b6 Fix site generation, please follow guidelines or make it works by yourself :( adds 231b524 Powered by rst and JRst adds f175566 refs #1319: Set button the same size adds d25e3da Improve message with file containing error adds 5bf7e81 fixes #880: Select running task in popup adds ff6651f Prevent too long task name to increase popup size adds cb6be0f Add missing icon adds 8e2866d Fixes #1338 (for this release but won't work with snapshot) adds ba46a63 Update readme.md adds 1264013 Clean i18n files adds f9f5d6d Fix some mnemonic adds 6bdd6ad [jgitflow-maven-plugin]updating poms for 1.5 branch with snapshot versions adds ab2fada [jgitflow-maven-plugin]updating poms for branch'release/1.5' with non-snapshot versions adds a6f2b93 [jgitflow-maven-plugin]merging 'release/1.5' into 'master' No new revisions were added by this update. Summary of changes: .gitignore | 19 + README.txt => README.md | 16 +- pom.xml | 254 ++--- src/main/assembly/bin.xml | 7 +- src/main/assembly/src.xml | 45 - src/main/config/checkstyle.xml | 3 - src/main/java/org/chorem/jtimer/JTimer.java | 291 +++--- src/main/java/org/chorem/jtimer/JTimerActions.java | 3 - src/main/java/org/chorem/jtimer/JTimerConfig.java | 125 ++- src/main/java/org/chorem/jtimer/JTimerFactory.java | 70 +- .../org/chorem/jtimer/data/CommonVetoable.java | 3 - .../org/chorem/jtimer/data/DataEventListener.java | 35 +- .../chorem/jtimer/data/DataViolationException.java | 3 - .../java/org/chorem/jtimer/data/TimerCore.java | 74 +- .../org/chorem/jtimer/data/TimerDataManager.java | 54 +- .../jtimer/data/VetoableDataEventListener.java | 3 - .../java/org/chorem/jtimer/data/package-info.java | 3 - .../org/chorem/jtimer/entities/TimerAlert.java | 3 - .../org/chorem/jtimer/entities/TimerProject.java | 24 +- .../java/org/chorem/jtimer/entities/TimerTask.java | 21 +- .../chorem/jtimer/entities/TimerTaskHelper.java | 67 +- .../org/chorem/jtimer/entities/package-info.java | 3 - .../java/org/chorem/jtimer/io/AbstractSaver.java | 3 - .../org/chorem/jtimer/io/DataLockingException.java | 3 - .../chorem/jtimer/io/GTimerIncrementalSaver.java | 585 ++++++----- .../java/org/chorem/jtimer/io/GTimerTimeUtil.java | 3 - src/main/java/org/chorem/jtimer/io/Saver.java | 18 +- .../java/org/chorem/jtimer/io/package-info.java | 3 - src/main/java/org/chorem/jtimer/package-info.java | 3 - src/main/java/org/chorem/jtimer/ui/HelpFrame.java | 9 +- .../java/org/chorem/jtimer/ui/NewTaskView.java | 172 ++++ src/main/java/org/chorem/jtimer/ui/StatusBar.java | 9 +- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 355 ++----- .../chorem/jtimer/ui/alert/AlertCellEditor.java | 11 +- .../chorem/jtimer/ui/alert/AlertCellRenderer.java | 9 +- .../org/chorem/jtimer/ui/alert/AlertEditor.java | 7 +- .../chorem/jtimer/ui/alert/AlertTableModel.java | 5 +- .../java/org/chorem/jtimer/ui/package-info.java | 3 - .../chorem/jtimer/ui/report/ReportGenerator.java | 52 +- .../org/chorem/jtimer/ui/report/ReportUtils.java | 15 +- .../org/chorem/jtimer/ui/report/ReportView.java | 230 ++--- .../org/chorem/jtimer/ui/report/package-info.java | 3 - .../org/chorem/jtimer/ui/system/SystemInfo.java | 5 +- .../chorem/jtimer/ui/system/SystemInfoFactory.java | 3 - .../ui/system/UnsupportedSystemInfoException.java | 3 - .../ui/system/macos/ApplicationServices.java | 9 +- .../jtimer/ui/system/macos/MacOSSystemInfo.java | 3 - .../jtimer/ui/system/macos/package-info.java | 3 - .../org/chorem/jtimer/ui/system/package-info.java | 3 - .../jtimer/ui/system/unix/UnixSystemInfo.java | 4 - .../java/org/chorem/jtimer/ui/system/unix/X11.java | 42 + .../java/org/chorem/jtimer/ui/system/unix/Xss.java | 20 +- .../chorem/jtimer/ui/system/unix/package-info.java | 3 - .../system/win32/Kernel32.java} | 45 +- .../org/chorem/jtimer/ui/system/win32/User32.java | 13 +- .../jtimer/ui/system/win32/Win32SystemInfo.java | 7 +- .../jtimer/ui/system/win32/package-info.java | 3 - .../chorem/jtimer/ui/systray/SystrayManager.java | 10 +- .../org/chorem/jtimer/ui/systray/package-info.java | 3 - .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 276 ++++-- .../chorem/jtimer/ui/tasks/RefreshTreeTask.java | 3 - .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 71 +- .../org/chorem/jtimer/ui/tasks/package-info.java | 3 - .../tree/CheckBoxTreeCellComponent.java | 19 +- .../{report => }/tree/CheckBoxTreeCellEditor.java | 7 +- .../tree/CheckBoxTreeCellRenderer.java | 12 +- .../jtimer/ui/tree/ProjectsAndTasksTree.java | 60 ++ .../TaskTreeModel.java} | 33 +- .../ui/treetable/ProjectsAndTasksCellRenderer.java | 272 +---- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 51 +- ...va => ProjectsAndTasksRunningCellRenderer.java} | 68 +- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 48 +- .../ui/treetable/dnd/TimerTaskTranferable.java | 3 - .../ui/treetable/dnd/TimerTaskTransferHandler.java | 21 +- .../jtimer/ui/treetable/dnd/package-info.java | 3 - .../chorem/jtimer/ui/treetable/package-info.java | 3 - .../org/chorem/jtimer/ui/widget/DialogView.java | 73 ++ .../chorem/jtimer/ui/widget/DurationEditor.java | 3 - .../chorem/jtimer/ui/widget/JPopupTrayIcon.java | 3 - .../chorem/jtimer/ui/widget/WindowProperty2.java | 3 +- .../ui/ws/SwingConnectionInformationHandler.java | 360 ------- .../java/org/chorem/jtimer/ui/ws/package-info.java | 28 - .../org/chorem/jtimer/utils/DailySortedMap.java | 6 +- .../java/org/chorem/jtimer/utils/package-info.java | 3 - .../chorem/jtimer/ws/ConnectionDataHandler.java | 51 - .../org/chorem/jtimer/ws/ProjectManagement.java | 144 --- .../jtimer/ws/exception/WebServiceException.java | 59 -- .../chorem/jtimer/ws/exception/package-info.java | 28 - .../java/org/chorem/jtimer/ws/package-info.java | 28 - .../jtimer/ws/xmlrpc/AbstractXMLRPCClient.java | 87 -- .../jtimer/ws/xmlrpc/ChoremXMLRPCClient.java | 1047 -------------------- .../java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java | 248 ----- .../org/chorem/jtimer/ws/xmlrpc/package-info.java | 28 - src/main/resources/ftl/reportByDay.ftl | 9 +- src/main/resources/ftl/reportByDay_fr.ftl | 11 +- src/main/resources/ftl/reportByMonth.ftl | 9 +- src/main/resources/ftl/reportByMonth_fr.ftl | 9 +- src/main/resources/ftl/reportByProject.ftl | 7 +- src/main/resources/ftl/reportByProject_fr.ftl | 9 +- src/main/resources/ftl/reportByWeek.ftl | 9 +- src/main/resources/ftl/reportByWeek_fr.ftl | 11 +- src/main/resources/ftl/reportByYear.ftl | 10 +- src/main/resources/ftl/reportByYear_fr.ftl | 12 +- src/main/resources/jtimer.properties | 2 - src/main/resources/log4j.properties | 54 - src/main/resources/log4j2.xml | 38 + .../org/chorem/jtimer/resources/JTimer.properties | 88 +- .../chorem/jtimer/resources/JTimer_fr.properties | 83 +- .../ui/alert/resources/AlertEditor.properties | 13 +- .../ui/alert/resources/AlertEditor_fr.properties | 13 +- .../ui/report/resources/ReportView.properties | 19 +- .../ui/report/resources/ReportView_fr.properties | 17 +- .../jtimer/ui/report/resources/dialog-close.png | Bin 0 -> 1382 bytes .../jtimer/ui/resources/HelpFrame.properties | 11 +- .../jtimer/ui/resources/HelpFrame_fr.properties | 11 +- .../NewTaskView.properties} | 17 +- .../NewTaskView_fr.properties} | 16 +- .../jtimer/ui/resources/StatusBar.properties | 5 +- .../jtimer/ui/resources/StatusBar_fr.properties | 5 +- .../jtimer/ui/resources/TimerTaskEditor.properties | 22 +- .../ui/resources/TimerTaskEditor_fr.properties | 22 +- .../jtimer/{ => ui}/resources/document-new.png | Bin .../ui/systray/resources/SystrayManager.properties | 9 +- .../systray/resources/SystrayManager_fr.properties | 9 +- .../ui/tasks/resources/IdleDialog.properties | 22 +- .../ui/tasks/resources/IdleDialog_fr.properties | 23 +- .../ui/tasks/resources/RunTaskJob.properties | 7 +- .../ui/tasks/resources/RunTaskJob_fr.properties | 7 +- .../ui/tasks/resources/document-revert-3.png | Bin 0 -> 2043 bytes .../resources/TimerTaskTransferHandler.properties | 14 +- .../TimerTaskTransferHandler_fr.properties | 10 +- .../resources/ProjectsAndTasksTable.properties | 9 +- .../resources/ProjectsAndTasksTable_fr.properties | 9 +- .../SwingConnectionInformationHandler.properties | 29 - ...SwingConnectionInformationHandler_fr.properties | 29 - src/site/en/rst/contribute/i18n.rst | 67 -- src/site/en/rst/devel/fileformat.rst | 127 --- src/site/en/rst/devel/index.rst | 57 -- src/site/en/rst/devel/roadmap.rst | 59 -- src/site/en/rst/devel/saf.rst | 127 --- src/site/en/rst/index.rst.vm | 66 -- src/site/en/rst/screenshots.rst | 54 - src/site/resources/images/jrst-logo.png | Bin 608 -> 0 bytes src/site/rst/configuration.rst | 60 ++ src/site/rst/contribute/i18n.rst | 35 +- src/site/rst/devel/fileformat.rst | 51 +- src/site/{en => }/rst/devel/idledetection.rst | 8 +- src/site/rst/devel/index.rst | 31 +- src/site/rst/devel/roadmap.rst | 32 +- src/site/rst/devel/saf.rst | 25 +- src/site/rst/index.rst.vm | 61 +- src/site/rst/screenshots.rst | 31 +- src/site/site.xml | 105 ++ src/site/site_en.xml | 117 --- src/site/site_fr.xml | 117 --- .../java/org/chorem/jtimer/AbstractJTimerTest.java | 18 +- .../java/org/chorem/jtimer/JTimerFactoryTest.java | 39 +- .../org/chorem/jtimer/data/CommonVetoableTest.java | 9 +- .../chorem/jtimer/data/TimerDataManagerTest.java | 16 +- .../org/chorem/jtimer/entities/TimerAlertTest.java | 9 +- .../chorem/jtimer/entities/TimerProjectTest.java | 17 - ...ctionDataTest.java => TimerTaskHelperTest.java} | 39 +- .../org/chorem/jtimer/entities/TimerTaskTest.java | 3 - .../org/chorem/jtimer/io/AbstractSaverTest.java | 3 - .../jtimer/io/GTimerIncrementalSaverTest.java | 19 +- .../jtimer/ui/report/ReportGeneratorTest.java | 33 +- .../chorem/jtimer/ui/report/ReportUtilsTest.java | 3 - .../jtimer/ui/system/SystemInfoFactoryTest.java | 3 - .../jtimer/ui/widget/DurationEditorTest.java | 3 - .../chorem/jtimer/utils/DailySortedMapTest.java | 62 +- src/test/resources/jtimertest.properties | 19 +- src/test/resources/templates/project1.txt | 11 + src/test/resources/templates/project2.yaml | 3 + 173 files changed, 2514 insertions(+), 5689 deletions(-) create mode 100644 .gitignore rename README.txt => README.md (71%) delete mode 100644 src/main/assembly/src.xml create mode 100644 src/main/java/org/chorem/jtimer/ui/NewTaskView.java create mode 100644 src/main/java/org/chorem/jtimer/ui/system/unix/X11.java rename src/main/java/org/chorem/jtimer/{entities/ConnectionData.java => ui/system/win32/Kernel32.java} (53%) mode change 100755 => 100644 rename src/main/java/org/chorem/jtimer/ui/{report => }/tree/CheckBoxTreeCellComponent.java (83%) rename src/main/java/org/chorem/jtimer/ui/{report => }/tree/CheckBoxTreeCellEditor.java (97%) rename src/main/java/org/chorem/jtimer/ui/{report => }/tree/CheckBoxTreeCellRenderer.java (87%) create mode 100644 src/main/java/org/chorem/jtimer/ui/tree/ProjectsAndTasksTree.java rename src/main/java/org/chorem/jtimer/ui/{report/tree/CheckBoxTreeModel.java => tree/TaskTreeModel.java} (84%) copy src/main/java/org/chorem/jtimer/ui/treetable/{ProjectsAndTasksCellRenderer.java => ProjectsAndTasksRunningCellRenderer.java} (79%) create mode 100644 src/main/java/org/chorem/jtimer/ui/widget/DialogView.java delete mode 100755 src/main/java/org/chorem/jtimer/ui/ws/SwingConnectionInformationHandler.java delete mode 100644 src/main/java/org/chorem/jtimer/ui/ws/package-info.java delete mode 100755 src/main/java/org/chorem/jtimer/ws/ConnectionDataHandler.java delete mode 100644 src/main/java/org/chorem/jtimer/ws/ProjectManagement.java delete mode 100644 src/main/java/org/chorem/jtimer/ws/exception/WebServiceException.java delete mode 100644 src/main/java/org/chorem/jtimer/ws/exception/package-info.java delete mode 100644 src/main/java/org/chorem/jtimer/ws/package-info.java delete mode 100644 src/main/java/org/chorem/jtimer/ws/xmlrpc/AbstractXMLRPCClient.java delete mode 100644 src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java delete mode 100644 src/main/java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java delete mode 100644 src/main/java/org/chorem/jtimer/ws/xmlrpc/package-info.java delete mode 100644 src/main/resources/log4j.properties create mode 100644 src/main/resources/log4j2.xml create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/dialog-close.png copy src/main/resources/org/chorem/jtimer/ui/{tasks/resources/RunTaskJob.properties => resources/NewTaskView.properties} (72%) copy src/main/resources/org/chorem/jtimer/ui/{tasks/resources/RunTaskJob.properties => resources/NewTaskView_fr.properties} (72%) copy src/main/resources/org/chorem/jtimer/{ => ui}/resources/document-new.png (100%) create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/document-revert-3.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties delete mode 100644 src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties delete mode 100644 src/site/en/rst/contribute/i18n.rst delete mode 100644 src/site/en/rst/devel/fileformat.rst delete mode 100644 src/site/en/rst/devel/index.rst delete mode 100644 src/site/en/rst/devel/roadmap.rst delete mode 100644 src/site/en/rst/devel/saf.rst delete mode 100644 src/site/en/rst/index.rst.vm delete mode 100644 src/site/en/rst/screenshots.rst delete mode 100644 src/site/resources/images/jrst-logo.png create mode 100644 src/site/rst/configuration.rst rename src/site/{en => }/rst/devel/idledetection.rst (95%) create mode 100644 src/site/site.xml delete mode 100644 src/site/site_en.xml delete mode 100644 src/site/site_fr.xml rename src/test/java/org/chorem/jtimer/entities/{ConnectionDataTest.java => TimerTaskHelperTest.java} (52%) create mode 100644 src/test/resources/templates/project1.txt create mode 100644 src/test/resources/templates/project2.yaml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm