This is an automated email from the git hooks/post-receive script. New commit to branch sync-timebundle in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 6649e66fe07d80eaa195e35f550e11a68a2f4822 Author: Eric Chatellier <chatellier@codelutin.com> Date: Wed Mar 8 10:34:02 2017 +0100 Fix idle dialog init --- .../org/chorem/jtimer/ui/tree/ProjectsAndTasksTree.java | 6 ++++-- src/main/java/org/chorem/jtimer/ui/tree/TaskTreeModel.java | 14 +++++++------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/ui/tree/ProjectsAndTasksTree.java b/src/main/java/org/chorem/jtimer/ui/tree/ProjectsAndTasksTree.java index b77c02d..b53016e 100644 --- a/src/main/java/org/chorem/jtimer/ui/tree/ProjectsAndTasksTree.java +++ b/src/main/java/org/chorem/jtimer/ui/tree/ProjectsAndTasksTree.java @@ -27,6 +27,7 @@ import org.chorem.jtimer.entities.TimerTaskHelper; import javax.swing.JTree; import javax.swing.tree.TreePath; +import java.util.ArrayList; import java.util.List; /** @@ -50,8 +51,9 @@ public class ProjectsAndTasksTree extends JTree { */ public void setSelectedTask(TimerTask task) { // compute task tree path - List<TimerTask> components = TimerTaskHelper.getPathFromParent(task); - components.add(0, (TimerTask) getModel().getRoot()); + List<Object> components = new ArrayList<>(); + components.add(getModel().getRoot()); + components.addAll(TimerTaskHelper.getPathFromParent(task)); // select tree path in reverse order (from root to leaf) TreePath path = new TreePath(components.toArray()); 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 8808349..8ef3be7 100644 --- a/src/main/java/org/chorem/jtimer/ui/tree/TaskTreeModel.java +++ b/src/main/java/org/chorem/jtimer/ui/tree/TaskTreeModel.java @@ -54,7 +54,7 @@ public class TaskTreeModel implements TreeModel { protected TreeModelSupport modelSupport; /** Tree data root. */ - protected List<TimerProject> root; + protected List<TimerProject> projects; /** Show closed tasks. */ protected boolean showClosed; @@ -70,7 +70,7 @@ public class TaskTreeModel implements TreeModel { } public TaskTreeModel(List<TimerProject> projects) { - root = projects; + this.projects = projects; modelSupport = new TreeModelSupport(this); } @@ -112,8 +112,8 @@ public class TaskTreeModel implements TreeModel { List<TimerTask> result = new ArrayList<>(); // get correct list - if (parent == root) { // case root node - result.addAll(root); + if (parent == getRoot()) { // case root node + result.addAll(projects); } else { // not root node TimerTask task = (TimerTask) parent; result.addAll(task.getSubTasks()); @@ -134,8 +134,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(parent); + return index; } @Override @@ -150,7 +150,7 @@ public class TaskTreeModel implements TreeModel { @Override public Object getRoot() { - return root; + return this; } @Override -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.