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

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

branch develop updated (304b94d -> d97a2b4)
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 304b94d fixes #143: On idle dialog, add an option to create a new task to assign idle time to new d97a2b4 fixes #144: Select the parent on "left arrow" key 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 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 Summary of changes: src/main/java/org/chorem/jtimer/JTimer.java | 39 ++++---- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 103 ++++++++++++++------- 2 files changed, 89 insertions(+), 53 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

01/01: fixes #143: On idle dialog, add an option to create a new task to assign idle time to
by chorem.org scm 05 Jun '18

05 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 304b94d6d14fd5d8925727a3314c9b3b3ddb8929 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Tue Jun 5 16:11:37 2018 +0200 fixes #143: On idle dialog, add an option to create a new task to assign idle time to --- src/main/java/org/chorem/jtimer/JTimer.java | 8 ++- .../java/org/chorem/jtimer/ui/NewTaskView.java | 34 ++++++++--- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 68 ++++++++++++++++++---- .../org/chorem/jtimer/ui/tree/TaskTreeModel.java | 10 +++- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 10 +++- .../org/chorem/jtimer/ui/widget/DialogView.java | 8 +-- .../ui/tasks/resources/IdleDialog.properties | 1 + .../ui/tasks/resources/IdleDialog_fr.properties | 2 + 8 files changed, 108 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/JTimer.java b/src/main/java/org/chorem/jtimer/JTimer.java index ab54d3e..c02b8b9 100644 --- a/src/main/java/org/chorem/jtimer/JTimer.java +++ b/src/main/java/org/chorem/jtimer/JTimer.java @@ -23,7 +23,6 @@ package org.chorem.jtimer; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -634,8 +633,13 @@ public class JTimer extends SingleFrameApplication implements // select task to add new task TimerTask selectedTask = projectsAndTasksTable.getSelectedElements().get(0); - NewTaskView newTaskPanel = new NewTaskView(this, core, selectedTask); + NewTaskView newTaskPanel = new NewTaskView(this.getMainFrame(), this, core, selectedTask); show(newTaskPanel); + + TimerTask newTask = newTaskPanel.getTask(); + if (newTask != null) { + selectTask(newTask); + } } /** diff --git a/src/main/java/org/chorem/jtimer/ui/NewTaskView.java b/src/main/java/org/chorem/jtimer/ui/NewTaskView.java index d8e4e12..e34aa9b 100644 --- a/src/main/java/org/chorem/jtimer/ui/NewTaskView.java +++ b/src/main/java/org/chorem/jtimer/ui/NewTaskView.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2016 CodeLutin + * Copyright (C) 2016 - 2018 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -22,6 +22,8 @@ package org.chorem.jtimer.ui; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.JTimer; import org.chorem.jtimer.data.DataViolationException; import org.chorem.jtimer.data.TimerCore; @@ -43,6 +45,7 @@ import java.awt.GridBagConstraints; import java.awt.GridBagLayout; import java.awt.GridLayout; import java.awt.Insets; +import java.awt.Window; import java.util.Date; import java.util.Map; import java.util.Set; @@ -58,16 +61,20 @@ import java.util.Set; */ public class NewTaskView extends DialogView { + /** log */ + private static Log log = LogFactory.getLog(NewTaskView.class); + protected JTimer parent; protected TimerCore core; protected ActionMap actionMap; protected TimerTask selectedTask; + protected TimerTask newTask; protected JTextField newTaskField; protected JComboBox<String> newTaskTemplateBox; - public NewTaskView(JTimer parent, TimerCore core, TimerTask selectedTask) { - super(parent.getMainFrame(), parent); + public NewTaskView(Window owner, JTimer parent, TimerCore core, TimerTask selectedTask) { + super(owner, parent); this.parent = parent; this.core = core; this.selectedTask = selectedTask; @@ -146,26 +153,35 @@ public class NewTaskView extends DialogView { String taskName = newTaskField.getText(); String taskTemplate = (String) newTaskTemplateBox.getSelectedItem(); - getApplication().hide(this); - // remove unneeded spaces taskName = taskName.trim(); - TimerTask t = new TimerTask(taskName); + newTask = new TimerTask(taskName); // Fix creation date - t.setCreationDate(new Date()); + newTask.setCreationDate(new Date()); try { - core.getData().addTask(selectedTask, t, taskTemplate); - parent.selectTask(t); + core.getData().addTask(selectedTask, newTask, taskTemplate); } catch (DataViolationException e) { parent.displayErrorMessage(e.getExceptionKey()); + newTask = null; } + + getApplication().hide(this); } @Action public void cancel() { getApplication().hide(this); } + + /** + * Returning new task after creation. + * + * @return new task + */ + public TimerTask getTask() { + return newTask; + } } diff --git a/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java b/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java index 82624ea..1c3e6f5 100644 --- a/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java +++ b/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2009 - 2016 CodeLutin + * Copyright (C) 2009 - 2018 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -28,6 +28,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.JTimer; import org.chorem.jtimer.data.TimerCore; import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.ui.NewTaskView; import org.chorem.jtimer.ui.tree.ProjectsAndTasksTree; import org.chorem.jtimer.ui.tree.TaskTreeModel; import org.chorem.jtimer.ui.treetable.ProjectsAndTasksCellRenderer; @@ -35,7 +36,6 @@ import org.jdesktop.application.Action; import org.jdesktop.application.ApplicationContext; import org.jdesktop.application.ResourceManager; import org.jdesktop.application.ResourceMap; -import org.jdesktop.application.SingleFrameApplication; import org.jdesktop.application.Task; import org.jdesktop.application.TaskMonitor; @@ -103,7 +103,7 @@ public class IdleDialog extends JDialog { protected static TimerTask assignSelectedTask; /** Parent application. */ - protected SingleFrameApplication application; + protected JTimer application; /** Timer core. */ protected TimerCore core; @@ -141,6 +141,9 @@ public class IdleDialog extends JDialog { /** Task selected in tree. */ protected boolean selectedTask; + /** Task selected in tree (other than current running task). */ + protected boolean selectedOtherTask; + /** * IdleDialog constructor. * @@ -149,7 +152,7 @@ public class IdleDialog extends JDialog { * @param application parent application * @param core timer core */ - protected IdleDialog(SingleFrameApplication application, TimerCore core) { + protected IdleDialog(JTimer application, TimerCore core) { // don't make reference on other parent // windows, cause idle to unlock some task // if parent window is hidden by systray @@ -271,13 +274,13 @@ public class IdleDialog extends JDialog { JPanel panel = new JPanel(new GridBagLayout()); // separator - panel.add(new JSeparator(), new GridBagConstraints(0, 0, 1, 1, 0, 0, + panel.add(new JSeparator(), new GridBagConstraints(0, 0, 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(0, 0, 0, 5), 0, 0)); // label JLabel labelIdle = new JLabel(); labelIdle.setText(resourceMap.getString("assignIdleTimeTo")); - panel.add(labelIdle, new GridBagConstraints(0, 1, 1, 1, 0, 0, + panel.add(labelIdle, new GridBagConstraints(0, 1, 2, 1, 0, 0, GridBagConstraints.CENTER, GridBagConstraints.HORIZONTAL, new Insets(3, 0, 0, 5), 0, 0)); // Tree @@ -287,6 +290,7 @@ public class IdleDialog extends JDialog { projectsTree.setModel(new TaskTreeModel(core, null)); projectsTree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION); projectsTree.setCellRenderer(new ProjectsAndTasksCellRenderer()); + projectsTree.setScrollsOnExpand(true); projectsTree.addTreeSelectionListener(e -> { TreePath path = e.getPath(); if (path.getPathCount() > 2) { @@ -295,15 +299,23 @@ public class IdleDialog extends JDialog { assignSelectedTask = null; } // must select a task and a different one from one running - setSelectedTask(assignSelectedTask != null && !assignSelectedTask.equals(currentRunningTask)); + setSelectedTask(assignSelectedTask != null); + // must select a task and a different one from one running + setSelectedOtherTask(assignSelectedTask != null && !assignSelectedTask.equals(currentRunningTask)); }); - panel.add(new JScrollPane(projectsTree), new GridBagConstraints(0, 2, 1, 1, 1, 1, + panel.add(new JScrollPane(projectsTree), new GridBagConstraints(0, 2, 2, 1, 1, 1, GridBagConstraints.CENTER, GridBagConstraints.BOTH, new Insets(0, 0, 3, 5), 0, 0)); + // new task + JButton newTaskButton = new JButton(); + newTaskButton.setAction(application.getContext().getActionMap(this).get("newTaskOption")); + panel.add(newTaskButton, new GridBagConstraints(0, 3, 1, 1, 0, 0, + GridBagConstraints.WEST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0)); + // ok JButton assignValidButton = new JButton(); assignValidButton.setAction(application.getContext().getActionMap(this).get("validAssignOption")); - panel.add(assignValidButton, new GridBagConstraints(0, 3, 1, 1, 0, 0, + panel.add(assignValidButton, new GridBagConstraints(1, 3, 1, 1, 0, 0, GridBagConstraints.EAST, GridBagConstraints.NONE, new Insets(0, 0, 0, 5), 0, 0)); return panel; @@ -319,13 +331,23 @@ public class IdleDialog extends JDialog { firePropertyChange("selectedTask", oldValue, selectedTask); } + public boolean isSelectedOtherTask() { + return selectedOtherTask; + } + + public void setSelectedOtherTask(boolean selectedOtherTask) { + boolean oldValue = this.selectedOtherTask; + this.selectedOtherTask = selectedOtherTask; + firePropertyChange("selectedOtherTask", oldValue, selectedOtherTask); + } + /** * Init dialog idleDialog instance. * * @param parent parent reference * @param core core reference */ - public static void init(SingleFrameApplication parent, TimerCore core) { + public static void init(JTimer parent, TimerCore core) { idleDialog = new IdleDialog(parent, core); } @@ -370,9 +392,31 @@ public class IdleDialog extends JDialog { } /** - * Action when validating assign option. + * Action when creating a new sub task. */ @Action(enabledProperty = "selectedTask") + public void newTaskOption() { + // select task to add new task + TreePath selectionPath = projectsTree.getSelectionPath(); + TimerTask selectedTask = (TimerTask) selectionPath.getLastPathComponent(); + + NewTaskView newTaskPanel = new NewTaskView(this, application, core, selectedTask); + application.show(newTaskPanel); + + TimerTask newTask = newTaskPanel.getTask(); + if (newTask != null) { + TaskTreeModel model = (TaskTreeModel)projectsTree.getModel(); + int newIndex = model.getIndexOfChild(selectedTask, newTask); + model.getModelSupport().fireChildAdded(selectionPath, newIndex, newTask); + projectsTree.expandPath(selectionPath); + projectsTree.setSelectedTask(newTask); + } + } + + /** + * Action when validating assign option. + */ + @Action(enabledProperty = "selectedOtherTask") public void validAssignOption() { lastResumeOption = IdleOption.ASSIGN; idleEnded(); @@ -455,7 +499,7 @@ public class IdleDialog extends JDialog { mutex.wait(); } catch (InterruptedException e) { if (log.isErrorEnabled()) { - log.error("Thread inturrupted", e); + log.error("Thread interrupted", e); } } } diff --git a/src/main/java/org/chorem/jtimer/ui/tree/TaskTreeModel.java b/src/main/java/org/chorem/jtimer/ui/tree/TaskTreeModel.java index a74af61..51963f7 100644 --- a/src/main/java/org/chorem/jtimer/ui/tree/TaskTreeModel.java +++ b/src/main/java/org/chorem/jtimer/ui/tree/TaskTreeModel.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2009 - 2016 CodeLutin + * Copyright (C) 2009 - 2018 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -73,6 +73,10 @@ public class TaskTreeModel implements TreeModel { modelSupport = new TreeModelSupport(this); } + public TreeModelSupport getModelSupport() { + return modelSupport; + } + @Override public Object getChild(Object parent, int index) { TimerTask child = getChildrenFor(parent).get(index); @@ -133,8 +137,8 @@ public class TaskTreeModel implements TreeModel { @Override public int getIndexOfChild(Object parent, Object child) { - int count = getChildrenFor(parent).indexOf(parent); - return count; + int index = getChildrenFor(parent).indexOf(child); + return index; } @Override diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java index 4ba03a3..cbcb532 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2016 CodeLutin + * Copyright (C) 2007 - 2018 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -288,8 +288,12 @@ public class ProjectsAndTasksModel extends AbstractTreeTableModel implements subTasksCache.remove(pathLastComponent); // force child recache int newIndex = getIndexOfChild(pathLastComponent, taskUO); modelSupport.fireChildAdded(path, newIndex, taskUO); - // expand path - projectsAndTaskTable.expandPath(path); + + // prevent side effect where tree branch is totally not visible + if (projectsAndTaskTable.isExpanded(path.getParentPath())) { + // expand path + projectsAndTaskTable.expandPath(path); + } break; } case OPERATION_DELETE: { diff --git a/src/main/java/org/chorem/jtimer/ui/widget/DialogView.java b/src/main/java/org/chorem/jtimer/ui/widget/DialogView.java index bdf5810..6773f8e 100644 --- a/src/main/java/org/chorem/jtimer/ui/widget/DialogView.java +++ b/src/main/java/org/chorem/jtimer/ui/widget/DialogView.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2016 CodeLutin + * Copyright (C) 2016 - 2018 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -27,8 +27,8 @@ import org.jdesktop.application.View; import javax.swing.JDialog; import javax.swing.JRootPane; -import java.awt.Frame; import java.awt.Image; +import java.awt.Window; import static org.jdesktop.application.Application.KEY_APPLICATION_ICON; import static org.jdesktop.application.Application.KEY_APPLICATION_TITLE; @@ -40,10 +40,10 @@ import static org.jdesktop.application.Application.KEY_APPLICATION_TITLE; public class DialogView extends View { public static final String MAIN_DIALOG_NAME = "mainDialog"; - protected Frame owner; + protected Window owner; protected JDialog dialog; - public DialogView(Frame owner, Application application) { + public DialogView(Window owner, Application application) { super(application); this.owner = owner; } diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties index df59e13..493e86c 100644 --- a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties +++ b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties @@ -44,5 +44,6 @@ chooseAssignOption.Action.text=&Assign\u2026 chooseAssignOption.Action.shortDescription=Assign idle time to another task chooseAssignOption.Action.icon=document-revert-3.png +newTaskOption.Action.text=New task... validAssignOption.Action.text=Assign and resume current task diff --git a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties index 1f22e4c..5b83800 100644 --- a/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties @@ -39,4 +39,6 @@ chooseResumeOption.Action.shortDescription=Reprendre la t\u00E2che en ne comptan chooseAssignOption.Action.text=&Assigner\u2026 chooseAssignOption.Action.shortDescription=Assigner le temps d'inactivit\u00E9 \u00E0 une autre t\u00E2che +newTaskOption.Action.text=Nouvelle t\u00E2che... validAssignOption.Action.text=Assigner et reprendre la t\u00E2che en cours + -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch develop updated (43b02e0 -> 304b94d)
by chorem.org scm 05 Jun '18

05 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 43b02e0 Remove timebundle code from master (refactored in branch) new 304b94d fixes #143: On idle dialog, add an option to create a new task to assign idle time to 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 304b94d6d14fd5d8925727a3314c9b3b3ddb8929 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Tue Jun 5 16:11:37 2018 +0200 fixes #143: On idle dialog, add an option to create a new task to assign idle time to Summary of changes: src/main/java/org/chorem/jtimer/JTimer.java | 8 ++- .../java/org/chorem/jtimer/ui/NewTaskView.java | 34 ++++++++--- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 68 ++++++++++++++++++---- .../org/chorem/jtimer/ui/tree/TaskTreeModel.java | 10 +++- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 10 +++- .../org/chorem/jtimer/ui/widget/DialogView.java | 8 +-- .../ui/tasks/resources/IdleDialog.properties | 1 + .../ui/tasks/resources/IdleDialog_fr.properties | 2 + 8 files changed, 108 insertions(+), 33 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

branch 1.6-database-h2 updated (f8ebac2 -> 1ba22e3)
by chorem.org scm 01 Jun '18

01 Jun '18

This is an automated email from the git hooks/post-receive script. New change to branch 1.6-database-h2 in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from f8ebac2 refs #142: Begin global refactoring new 1ba22e3 refs #142: Resolve all compile errors 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 1ba22e309cf05fde30e6139f13115301aeb3b552 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Fri Jun 1 17:19:54 2018 +0200 refs #142: Resolve all compile errors Summary of changes: pom.xml | 18 +- src/main/java/org/chorem/jtimer/JTimer.java | 96 +-- .../org/chorem/jtimer/core/ApplicationContext.java | 18 +- .../java/org/chorem/jtimer/core/Configuration.java | 2 + src/main/java/org/chorem/jtimer/core/Context.java | 41 ++ src/main/java/org/chorem/jtimer/db/Database.java | 11 +- .../java/org/chorem/jtimer/db/DbDataMigration.java | 11 +- src/main/java/org/chorem/jtimer/db/DbManager.java | 3 +- .../chorem/jtimer/entities/TimerTaskHelper.java | 2 + .../java/org/chorem/jtimer/io/AbstractSaver.java | 6 +- .../java/org/chorem/jtimer/io/BackupUtils.java | 113 --- .../org/chorem/jtimer/io/DataLockingException.java | 58 -- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 768 +-------------------- .../java/org/chorem/jtimer/io/GTimerTimeUtil.java | 2 +- src/main/java/org/chorem/jtimer/io/Saver.java | 25 +- .../jtimer/{entities => io}/TimerProject.java | 4 +- .../java/org/chorem/jtimer/io/package-info.java | 2 +- .../org/chorem/jtimer/services/AlertService.java | 13 +- .../chorem/jtimer/services/ContextableService.java | 17 + .../org/chorem/jtimer/services/ReportService.java | 8 +- .../org/chorem/jtimer/services/TaskService.java | 65 +- .../org/chorem/jtimer/services/TimeService.java | 14 +- .../java/org/chorem/jtimer/ui/NewTaskView.java | 8 +- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 43 +- .../org/chorem/jtimer/ui/alert/AlertEditor.java | 3 +- .../chorem/jtimer/ui/report/ReportGenerator.java | 2 +- .../org/chorem/jtimer/ui/report/ReportView.java | 3 +- .../chorem/jtimer/ui/systray/SystrayManager.java | 1 - .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 2 +- .../chorem/jtimer/ui/tasks/RefreshTreeTask.java | 2 +- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 7 +- .../org/chorem/jtimer/ui/tree/TaskTreeModel.java | 1 - .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 6 +- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 5 +- .../ui/treetable/dnd/TimerTaskTransferHandler.java | 17 +- src/main/resources/log4j2.xml | 38 - src/main/resources/logback.xml | 16 + 37 files changed, 266 insertions(+), 1185 deletions(-) delete mode 100644 src/main/java/org/chorem/jtimer/io/BackupUtils.java delete mode 100644 src/main/java/org/chorem/jtimer/io/DataLockingException.java rename src/main/java/org/chorem/jtimer/{entities => io}/TimerProject.java (95%) create mode 100644 src/main/java/org/chorem/jtimer/services/ContextableService.java delete mode 100644 src/main/resources/log4j2.xml create mode 100644 src/main/resources/logback.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

branch 1.6-database-h2 updated (250b866 -> f8ebac2)
by chorem.org scm 01 Jun '18

01 Jun '18

This is an automated email from the git hooks/post-receive script. New change to branch 1.6-database-h2 in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git from 250b866 refs #142: Begin h2 storage refactoring new 827cbd6 refs #142: Retrait des Node object new f8ebac2 refs #142: Begin global refactoring 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 f8ebac2a2a1c1535f12bcd306ee0c82cbf9ba865 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Fri Jun 1 15:48:09 2018 +0200 refs #142: Begin global refactoring commit 827cbd6357f376b5141f0c61f301c709cd2d0f58 Author: Eric Chatellier <chatellier(a)codelutin.com> Date: Thu May 31 16:48:28 2018 +0200 refs #142: Retrait des Node object Summary of changes: pom.xml | 14 +- src/main/java/org/chorem/jtimer/JTimer.java | 192 ++---- src/main/java/org/chorem/jtimer/JTimerActions.java | 78 --- src/main/java/org/chorem/jtimer/JTimerFactory.java | 91 --- .../org/chorem/jtimer/core/ApplicationContext.java | 144 +++++ .../{JTimerConfig.java => core/Configuration.java} | 50 +- .../{db/DbException.java => core/Context.java} | 23 +- .../org/chorem/jtimer/data/CommonVetoable.java | 208 ------- .../org/chorem/jtimer/data/DataEventListener.java | 193 ------ .../chorem/jtimer/data/DataViolationException.java | 75 --- .../java/org/chorem/jtimer/data/TimerCore.java | 215 ------- .../org/chorem/jtimer/data/TimerDataManager.java | 678 --------------------- .../jtimer/data/VetoableDataEventListener.java | 148 ----- .../java/org/chorem/jtimer/data/package-info.java | 25 - src/main/java/org/chorem/jtimer/db/Database.java | 6 +- .../java/org/chorem/jtimer/db/DbDataMigration.java | 14 +- src/main/java/org/chorem/jtimer/db/DbManager.java | 62 +- .../java/org/chorem/jtimer/db/NodeAndCount.java | 55 -- .../java/org/chorem/jtimer/entities/TimerTask.java | 30 +- .../chorem/jtimer/io/GTimerIncrementalSaver.java | 69 +-- src/main/java/org/chorem/jtimer/io/Saver.java | 4 +- .../org/chorem/jtimer/services/AlertService.java | 4 + .../org/chorem/jtimer/services/ReportService.java | 4 + .../org/chorem/jtimer/services/TaskService.java | 5 + .../org/chorem/jtimer/services/TimeService.java | 4 + .../org/chorem/jtimer/system/win32/User32.java | 2 +- .../java/org/chorem/jtimer/ui/NewTaskView.java | 13 +- src/main/java/org/chorem/jtimer/ui/StatusBar.java | 29 +- .../java/org/chorem/jtimer/ui/TimerTaskEditor.java | 14 +- .../org/chorem/jtimer/ui/alert/AlertEditor.java | 9 +- .../org/chorem/jtimer/ui/report/ReportView.java | 20 +- .../chorem/jtimer/ui/systray/SystrayManager.java | 17 +- .../org/chorem/jtimer/ui/tasks/IdleDialog.java | 23 +- .../chorem/jtimer/ui/tasks/RefreshTreeTask.java | 12 +- .../org/chorem/jtimer/ui/tasks/RunTaskJob.java | 10 +- .../jtimer/ui/tree/CheckBoxTreeCellComponent.java | 15 +- .../jtimer/ui/tree/CheckBoxTreeCellEditor.java | 14 +- .../jtimer/ui/tree/CheckBoxTreeCellRenderer.java | 11 +- .../org/chorem/jtimer/ui/tree/TaskTreeModel.java | 9 +- .../ui/treetable/ProjectsAndTasksCellRenderer.java | 5 +- .../jtimer/ui/treetable/ProjectsAndTasksModel.java | 62 +- .../ProjectsAndTasksRunningCellRenderer.java | 17 +- .../jtimer/ui/treetable/ProjectsAndTasksTable.java | 11 +- .../ui/treetable/dnd/TimerTaskTransferHandler.java | 10 +- .../java/org/chorem/jtimer/AbstractJTimerTest.java | 362 ----------- .../java/org/chorem/jtimer/JTimerFactoryTest.java | 95 --- .../org/chorem/jtimer/data/CommonVetoableTest.java | 196 ------ .../chorem/jtimer/data/TimerDataManagerTest.java | 638 ------------------- .../org/chorem/jtimer/entities/TimerAlertTest.java | 130 ---- .../chorem/jtimer/entities/TimerProjectTest.java | 66 -- .../jtimer/entities/TimerTaskHelperTest.java | 52 -- .../org/chorem/jtimer/entities/TimerTaskTest.java | 119 ---- .../org/chorem/jtimer/io/AbstractSaverTest.java | 101 --- .../jtimer/io/GTimerIncrementalSaverTest.java | 419 ------------- .../jtimer/system/SystemInfoFactoryTest.java | 69 --- .../jtimer/ui/report/ReportGeneratorTest.java | 368 ----------- .../chorem/jtimer/ui/report/ReportUtilsTest.java | 319 ---------- .../jtimer/ui/widget/DurationEditorTest.java | 56 -- .../chorem/jtimer/utils/DailySortedMapTest.java | 538 ---------------- 59 files changed, 476 insertions(+), 5746 deletions(-) delete mode 100644 src/main/java/org/chorem/jtimer/JTimerActions.java delete mode 100644 src/main/java/org/chorem/jtimer/JTimerFactory.java create mode 100644 src/main/java/org/chorem/jtimer/core/ApplicationContext.java rename src/main/java/org/chorem/jtimer/{JTimerConfig.java => core/Configuration.java} (83%) copy src/main/java/org/chorem/jtimer/{db/DbException.java => core/Context.java} (64%) delete mode 100644 src/main/java/org/chorem/jtimer/data/CommonVetoable.java delete mode 100644 src/main/java/org/chorem/jtimer/data/DataEventListener.java delete mode 100644 src/main/java/org/chorem/jtimer/data/DataViolationException.java delete mode 100644 src/main/java/org/chorem/jtimer/data/TimerCore.java delete mode 100644 src/main/java/org/chorem/jtimer/data/TimerDataManager.java delete mode 100644 src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java delete mode 100644 src/main/java/org/chorem/jtimer/data/package-info.java delete mode 100644 src/main/java/org/chorem/jtimer/db/NodeAndCount.java create mode 100644 src/main/java/org/chorem/jtimer/services/AlertService.java create mode 100644 src/main/java/org/chorem/jtimer/services/ReportService.java create mode 100644 src/main/java/org/chorem/jtimer/services/TaskService.java create mode 100644 src/main/java/org/chorem/jtimer/services/TimeService.java delete mode 100644 src/test/java/org/chorem/jtimer/AbstractJTimerTest.java delete mode 100644 src/test/java/org/chorem/jtimer/JTimerFactoryTest.java delete mode 100644 src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java delete mode 100644 src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java delete mode 100644 src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java delete mode 100644 src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java delete mode 100644 src/test/java/org/chorem/jtimer/entities/TimerTaskHelperTest.java delete mode 100644 src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java delete mode 100644 src/test/java/org/chorem/jtimer/io/AbstractSaverTest.java delete mode 100644 src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java delete mode 100644 src/test/java/org/chorem/jtimer/system/SystemInfoFactoryTest.java delete mode 100644 src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java delete mode 100644 src/test/java/org/chorem/jtimer/ui/report/ReportUtilsTest.java delete mode 100644 src/test/java/org/chorem/jtimer/ui/widget/DurationEditorTest.java delete mode 100644 src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2