- Jtimer-commits - mailman.cloud.codelutin.com

branch develop updated (0be0fe6 -> 677a32f)
by chorem.org scm 02 Mar '20

02 Mar '20

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 0be0fe6 Update libs new 7710d0e fixes #151: Try to fix NPE with swing utilities new 2227172 Improve UI (dialog icon) new 8b56d2c fixes #152: Use fatcow icons new 677a32f fixes #149: Update snakeyaml The 4 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 677a32fc29832f736bcc12114a7b3cf82438958d Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Mar 2 16:46:28 2020 +0100 fixes #149: Update snakeyaml commit 8b56d2c79c0e41f4ccb24769507cba3453107823 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Mar 2 16:44:59 2020 +0100 fixes #152: Use fatcow icons commit 222717292e6328c3278bd7ed75f4ae07eecb68ad Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Mar 2 16:42:46 2020 +0100 Improve UI (dialog icon) commit 7710d0e6dab5608c17238ff5d2ddf780d8506c6a Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Mar 2 16:39:13 2020 +0100 fixes #151: Try to fix NPE with swing utilities Summary of changes: README.md | 5 +--- pom.xml | 30 ++++++++------------- src/main/java/org/chorem/jtimer/JTimer.java | 12 ++++----- src/main/java/org/chorem/jtimer/JTimerFactory.java | 15 +++++------ .../java/org/chorem/jtimer/ui/NewTaskView.java | 4 +-- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 9 ++++++- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 1 + .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 8 +++++- .../plugin/timebundle/resources/dialog-close.png | Bin 1382 -> 0 bytes .../org/chorem/jtimer/resources/JTimer.properties | 16 +++++------ .../chorem/jtimer/resources/JTimer_fr.properties | 8 +----- .../resources/org/chorem/jtimer/resources/bell.png | Bin 1887 -> 2110 bytes .../org/chorem/jtimer/resources/bookmark-new.png | Bin 1532 -> 0 bytes .../org/chorem/jtimer/resources/clock_play.png | Bin 0 -> 2609 bytes .../org/chorem/jtimer/resources/clock_stop.png | Bin 0 -> 2513 bytes .../org/chorem/jtimer/resources/date_task.png | Bin 0 -> 2358 bytes .../org/chorem/jtimer/resources/document-new.png | Bin 1008 -> 0 bytes .../org/chorem/jtimer/resources/go-next.png | Bin 1219 -> 0 bytes .../org/chorem/jtimer/resources/note_add.png | Bin 0 -> 1409 bytes .../org/chorem/jtimer/resources/notes.png | Bin 2234 -> 0 bytes .../org/chorem/jtimer/resources/process-stop.png | Bin 1927 -> 0 bytes .../org/chorem/jtimer/resources/report_add.png | Bin 0 -> 1871 bytes .../ui/alert/resources/AlertEditor.properties | 6 ++++- .../jtimer/ui/alert/resources/accept_button.png | Bin 0 -> 712 bytes .../org/chorem/jtimer/ui/alert/resources/add.png | Bin 0 -> 698 bytes .../org/chorem/jtimer/ui/alert/resources/cross.png | Bin 0 -> 473 bytes .../chorem/jtimer/ui/alert/resources/delete.png | Bin 0 -> 695 bytes .../ui/report/resources/ReportView.properties | 10 +++---- .../ui/report/resources/applications-system.png | Bin 1488 -> 0 bytes .../chorem/jtimer/ui/report/resources/cross.png | Bin 0 -> 1049 bytes .../org/chorem/jtimer/ui/report/resources/date.png | Bin 0 -> 775 bytes .../jtimer/ui/report/resources/date_current.png | Bin 667 -> 0 bytes .../jtimer/ui/report/resources/date_previous.png | Bin 720 -> 761 bytes .../jtimer/ui/report/resources/dialog-close.png | Bin 1382 -> 0 bytes .../ui/report/resources/document_prepare.png | Bin 0 -> 1675 bytes .../chorem/jtimer/ui/report/resources/email_go.png | Bin 0 -> 1364 bytes .../jtimer/ui/report/resources/mail-forward.png | Bin 893 -> 0 bytes .../jtimer/ui/resources/NewTaskView.properties | 4 +-- .../org/chorem/jtimer/ui/resources/date_task.png | Bin 0 -> 2358 bytes .../chorem/jtimer/ui/resources/document-new.png | Bin 1008 -> 0 bytes .../ui/tasks/resources/IdleDialog.properties | 12 ++++----- .../ui/tasks/resources/RunTaskJob.properties | 4 +-- .../jtimer/ui/tasks/resources/appointment-new.png | Bin 2399 -> 0 bytes .../jtimer/ui/tasks/resources/arrow_right.png | Bin 0 -> 577 bytes .../org/chorem/jtimer/ui/tasks/resources/bell.png | Bin 0 -> 2110 bytes .../chorem/jtimer/ui/tasks/resources/bell48.png | Bin 3725 -> 0 bytes .../jtimer/ui/tasks/resources/clock_edit.png | Bin 0 -> 2726 bytes .../jtimer/ui/tasks/resources/clock_pause.png | Bin 0 -> 2583 bytes .../ui/tasks/resources/document-revert-3.png | Bin 2043 -> 0 bytes .../chorem/jtimer/ui/tasks/resources/go-jump.png | Bin 1491 -> 0 bytes .../chorem/jtimer/ui/tasks/resources/go-next.png | Bin 1219 -> 0 bytes .../jtimer/ui/tasks/resources/process-stop.png | Bin 1927 -> 0 bytes .../org/chorem/jtimer/ui/tasks/resources/stop.png | Bin 0 -> 1173 bytes .../ui/tasks/resources/unmark_to_download.png | Bin 0 -> 8134 bytes 54 files changed, 70 insertions(+), 74 deletions(-) delete mode 100644 src/main/resources/org/chorem/jtimer/plugin/timebundle/resources/dialog-close.png mode change 100755 => 100644 src/main/resources/org/chorem/jtimer/resources/bell.png delete mode 100644 src/main/resources/org/chorem/jtimer/resources/bookmark-new.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/clock_play.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/clock_stop.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/date_task.png delete mode 100644 src/main/resources/org/chorem/jtimer/resources/document-new.png delete mode 100644 src/main/resources/org/chorem/jtimer/resources/go-next.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/note_add.png delete mode 100755 src/main/resources/org/chorem/jtimer/resources/notes.png delete mode 100644 src/main/resources/org/chorem/jtimer/resources/process-stop.png create mode 100644 src/main/resources/org/chorem/jtimer/resources/report_add.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/alert/resources/accept_button.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/alert/resources/add.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/alert/resources/cross.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/alert/resources/delete.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/applications-system.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/cross.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/date.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/date_current.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/dialog-close.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/document_prepare.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/email_go.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/report/resources/mail-forward.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/resources/date_task.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/resources/document-new.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/appointment-new.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/arrow_right.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell.png delete mode 100755 src/main/resources/org/chorem/jtimer/ui/tasks/resources/bell48.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_edit.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/clock_pause.png delete 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/tasks/resources/go-jump.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/go-next.png delete mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/process-stop.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/stop.png create mode 100644 src/main/resources/org/chorem/jtimer/ui/tasks/resources/unmark_to_download.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 4

branch develop updated (9e128d8 -> 0be0fe6)
by chorem.org scm 06 Jan '20

06 Jan '20

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 9e128d8 fixes #150: Does not build on JDK11 new 0be0fe6 Update libs 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 0be0fe65c9f0e31f8d3045659ddd448363ecb29a Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Mon Jan 6 12:26:08 2020 +0100 Update libs Summary of changes: pom.xml | 8 ++++---- .../resources/org/chorem/jtimer/ui/resources/HelpFrame.properties | 2 +- .../org/chorem/jtimer/ui/resources/HelpFrame_fr.properties | 2 +- .../java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (1a2d9b9 -> 9e128d8)
by chorem.org scm 24 Oct '19

24 Oct '19

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 1a2d9b9 Fix logback config. new 9e128d8 fixes #150: Does not build on JDK11 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 9e128d8a24c027c9af33b6caa02f09fdbf31773d Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Thu Oct 24 16:00:15 2019 +0200 fixes #150: Does not build on JDK11 Summary of changes: .../java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (7b5a7f1 -> 1a2d9b9)
by chorem.org scm 16 Oct '19

16 Oct '19

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 7b5a7f1 Update libs. Switch to logback. new 1a2d9b9 Fix logback config. 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 1a2d9b94ba882c40aa02d894effd640a928ca7c2 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Oct 16 17:52:14 2019 +0200 Fix logback config. Summary of changes: src/main/resources/logback.xml | 2 ++ 1 file changed, 2 insertions(+) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (f92ff6f -> 7b5a7f1)
by chorem.org scm 16 Oct '19

16 Oct '19

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 f92ff6f Try to fix Sonar build new 7b5a7f1 Update libs. Switch to logback. 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 7b5a7f1bde61efe2e04edbfc8c2735608f2b18c4 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Oct 16 17:45:26 2019 +0200 Update libs. Switch to logback. Summary of changes: pom.xml | 47 ++++++++++++++++---------- src/main/resources/{log4j2.xml => logback.xml} | 31 +++++++---------- 2 files changed, 42 insertions(+), 36 deletions(-) rename src/main/resources/{log4j2.xml => logback.xml} (61%) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (6e984dd -> f92ff6f)
by chorem.org scm 23 Sep '19

23 Sep '19

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 6e984dd Setup Sonar build new f92ff6f Try to fix Sonar build 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 f92ff6f7dc3f029ad0e046e7e9205f8dd8892e3d Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Mon Sep 23 15:58:25 2019 +0200 Try to fix Sonar build Summary of changes: .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (0f049bc -> 6e984dd)
by chorem.org scm 23 Sep '19

23 Sep '19

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 0f049bc fixes #149: Update libs new 6e984dd Setup Sonar build 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 6e984dd5c26c46d9f7a900a7579b9e6bf67aae94 Author: Arnaud Thimel <thimel(a)codelutin.com> Date: Mon Sep 23 15:47:15 2019 +0200 Setup Sonar build Summary of changes: .gitlab-ci.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch develop updated (116e58a -> 0f049bc)
by chorem.org scm 10 Jul '19

10 Jul '19

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 116e58a fixes #145: Add an option to show in system tray the name of the currently running task new 114fa16 fixes #148: An illegal reflective access operation on java 11 new 0f049bc fixes #149: Update libs The 2 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 0f049bcd97e05d03cb53fe4e4089d6ce37091800 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Jul 10 16:42:06 2019 +0200 fixes #149: Update libs commit 114fa1689291d735e9e641ada6788c06b66a0eba Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Jul 10 16:31:38 2019 +0200 fixes #148: An illegal reflective access operation on java 11 Summary of changes: pom.xml | 16 +++++++-------- src/main/java/org/chorem/jtimer/JTimer.java | 7 ++----- .../java/org/chorem/jtimer/system/SystemInfo.java | 5 ----- .../jtimer/system/macos/ApplicationServices.java | 2 +- .../jtimer/system/macos/MacOSSystemInfo.java | 7 +------ .../chorem/jtimer/system/unix/UnixSystemInfo.java | 24 +--------------------- .../java/org/chorem/jtimer/system/unix/X11.java | 2 +- .../java/org/chorem/jtimer/system/unix/Xss.java | 2 +- .../org/chorem/jtimer/system/win32/Kernel32.java | 2 +- .../org/chorem/jtimer/system/win32/User32.java | 2 +- .../jtimer/system/win32/Win32SystemInfo.java | 7 +------ .../jtimer/ui/resources/HelpFrame.properties | 2 +- .../jtimer/ui/resources/HelpFrame_fr.properties | 2 +- 13 files changed, 20 insertions(+), 60 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

branch develop updated (d97a2b4 -> 116e58a)
by chorem.org scm 20 Jun '18

20 Jun '18

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 d97a2b4 fixes #144: Select the parent on "left arrow" key new 116e58a fixes #145: Add an option to show in system tray the name of the currently running task 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 116e58ae8d244bb37f33f28a7d93275e1b84418f Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Jun 20 17:34:32 2018 +0200 fixes #145: Add an option to show in system tray the name of the currently running task Summary of changes: src/main/java/org/chorem/jtimer/JTimer.java | 19 +++++++++++++++++++ src/main/java/org/chorem/jtimer/JTimerConfig.java | 22 +++++++++++++++++++++- .../chorem/jtimer/ui/systray/SystrayManager.java | 8 ++++++-- .../org/chorem/jtimer/resources/JTimer.properties | 7 +++++-- .../chorem/jtimer/resources/JTimer_fr.properties | 3 +++ .../ui/systray/resources/SystrayManager.properties | 1 + .../systray/resources/SystrayManager_fr.properties | 1 + 7 files changed, 56 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

01/01: fixes #144: Select the parent on "left arrow" key
by chorem.org scm 20 Jun '18

20 Jun '18

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 d97a2b4a8893bea456218d2df78f5624b9903ec2 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Wed Jun 20 17:13:34 2018 +0200 fixes #144: Select the parent on "left arrow" key --- src/main/java/org/chorem/jtimer/JTimer.java | 39 ++++---- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 103 ++++++++++++++------- 2 files changed, 89 insertions(+), 53 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/JTimer.java b/src/main/java/org/chorem/jtimer/JTimer.java index c02b8b9..0402637 100644 --- a/src/main/java/org/chorem/jtimer/JTimer.java +++ b/src/main/java/org/chorem/jtimer/JTimer.java @@ -1438,24 +1438,7 @@ public class JTimer extends SingleFrameApplication implements if (e.getSource() == projectsAndTasksTable) { // demarre la tache lors d'un double clic dessus if (e.getClickCount() == 2) { - - if (isSelectedSingleStoppedTask()) { // can only launch non running tasks - Task<?, ?> appTask = startTask(); - if (appTask != null) { - - // first, on dlb click stop all running tasks - stopAllTasks(); - - getContext().getTaskService().execute(appTask); - } - } else if (isSelectedSingleTask()) { - TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); - stopTask(task); - } else { - if (log.isDebugEnabled()) { - log.debug("Non selected non running task to launch"); - } - } + startOrStopCurrentSelectedTask(); } else { if (log.isDebugEnabled()) { log.debug("Single clic on tree, do nothing"); @@ -1506,6 +1489,26 @@ public class JTimer extends SingleFrameApplication implements } } + public void startOrStopCurrentSelectedTask() { + if (isSelectedSingleStoppedTask()) { // can only launch non running tasks + Task<?, ?> appTask = startTask(); + if (appTask != null) { + + // first, on dlb click stop all running tasks + stopAllTasks(); + + getContext().getTaskService().execute(appTask); + } + } else if (isSelectedSingleTask()) { + TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); + stopTask(task); + } else { + if (log.isDebugEnabled()) { + log.debug("Non selected non running task to launch"); + } + } + } + @Override public void mouseEntered(MouseEvent e) { } diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java index aabb82d..5356211 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2016 CodeLutin, Chemit Tony + * Copyright (C) 2007 - 2018 CodeLutin, Chemit Tony * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -22,12 +22,12 @@ package org.chorem.jtimer.ui.treetable; +import org.chorem.jtimer.JTimer; import org.chorem.jtimer.data.TimerCore; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; import org.chorem.jtimer.entities.TimerTaskHelper; import org.chorem.jtimer.ui.treetable.dnd.TimerTaskTransferHandler; -import org.jdesktop.application.Application; import org.jdesktop.application.ApplicationContext; import org.jdesktop.application.ResourceManager; import org.jdesktop.application.ResourceMap; @@ -61,6 +61,9 @@ public class ProjectsAndTasksTable extends JXTreeTable { /** serialVersionUID. */ private static final long serialVersionUID = -6909972377431117193L; + /** Parent application. */ + protected JTimer parent; + /** Table model. */ protected ProjectsAndTasksModel treeTableModel; @@ -70,13 +73,14 @@ public class ProjectsAndTasksTable extends JXTreeTable { /** * Constructor. * - * @param application application + * @param parent parent * @param core timer core */ - public ProjectsAndTasksTable(Application application, TimerCore core) { + public ProjectsAndTasksTable(JTimer parent, TimerCore core) { + this.parent = parent; // start with init i18n of table column name - ApplicationContext ctxt = application.getContext(); + ApplicationContext ctxt = parent.getContext(); ResourceManager mgr = ctxt.getResourceManager(); ResourceMap resourceMap = mgr.getResourceMap(ProjectsAndTasksTable.class); // init list @@ -103,44 +107,73 @@ public class ProjectsAndTasksTable extends JXTreeTable { // enable drag n drop setDragEnabled(true); - setTransferHandler(new TimerTaskTransferHandler(application, core.getData())); + setTransferHandler(new TimerTaskTransferHandler(parent, core.getData())); - { // add action to collapse (left arrow) selected node - Action action = new AbstractAction("collapseSelectedNode") { - private static final long serialVersionUID = 1L; + registerKeys(); + } - @Override - public void actionPerformed(ActionEvent e) { - int selectedRow = getSelectedRow(); - if (selectedRow != -1) { + /** + * Add some key action to tree. + */ + protected void registerKeys() { + // add action to collapse (left arrow) selected node + Action actionLeft = new AbstractAction("collapseSelectedNode") { + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + int selectedRow = getSelectedRow(); + if (selectedRow != -1) { + if (isExpanded(selectedRow)) { collapseRow(selectedRow); + } else { + // select parent node + TimerTask timerTask = getSelectedTasks().get(0); + setSelectedTask(timerTask.getParent()); } } - }; + } + }; - getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( - KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), - action.getValue(Action.NAME)); - getActionMap().put(action.getValue(Action.NAME), action); - } - { // add action to expand (right arrow) selected node - Action action = new AbstractAction("expandSelectedNode") { - private static final long serialVersionUID = 1L; - - @Override - public void actionPerformed(ActionEvent e) { - int selectedRow = getSelectedRow(); - if (selectedRow != -1) { - expandRow(selectedRow); - } + getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( + KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, 0), + actionLeft.getValue(Action.NAME)); + getActionMap().put(actionLeft.getValue(Action.NAME), actionLeft); + + + // add action to expand (right arrow) selected node + Action actionRight = new AbstractAction("expandSelectedNode") { + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + int selectedRow = getSelectedRow(); + if (selectedRow != -1) { + expandRow(selectedRow); } - }; + } + }; - getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( - KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0), - action.getValue(Action.NAME)); - getActionMap().put(action.getValue(Action.NAME), action); - } + getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( + KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, 0), + actionRight.getValue(Action.NAME)); + getActionMap().put(actionRight.getValue(Action.NAME), actionRight); + + + // add action to collapse (left arrow) selected node + Action actionEnter = new AbstractAction("startSelectedTask") { + private static final long serialVersionUID = 1L; + + @Override + public void actionPerformed(ActionEvent e) { + parent.startOrStopCurrentSelectedTask(); + } + }; + + getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put( + KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), + actionEnter.getValue(Action.NAME)); + getActionMap().put(actionEnter.getValue(Action.NAME), actionEnter); } /** -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0