This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jtimer. See http://git.chorem.org/jtimer.git commit 348b57b83c4f841756efa27ae349647f1a18d094 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon Mar 7 16:55:01 2016 +0100 Remove unused sync project --- .../org/chorem/jtimer/entities/TimerProject.java | 21 +-------------------- .../org/chorem/jtimer/entities/TimerTaskHelper.java | 10 +--------- .../jtimer/ui/tree/CheckBoxTreeCellComponent.java | 14 ++------------ .../ui/treetable/ProjectsAndTasksCellRenderer.java | 21 +-------------------- .../chorem/jtimer/entities/TimerProjectTest.java | 14 -------------- 5 files changed, 5 insertions(+), 75 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/entities/TimerProject.java b/src/main/java/org/chorem/jtimer/entities/TimerProject.java index f1db1db..ad64ff6 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerProject.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerProject.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2007 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2007 - 2016 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -36,9 +36,6 @@ public class TimerProject extends TimerTask { /** serialVersionUID. */ private static final long serialVersionUID = -8953488997256237790L; - /** Synchronized project name prefix. */ - public static final String SYNCHRONIZED_PROJECT_NAME_PREFIX = "#"; - /** * Constructor. */ @@ -55,22 +52,6 @@ public class TimerProject extends TimerTask { } /** - * Is synchronized. - * - * @return the synchronize - */ - public boolean isSynchronized() { - - boolean sync = false; - - if (name != null && name.startsWith(SYNCHRONIZED_PROJECT_NAME_PREFIX)) { - sync = true; - } - - return sync; - } - - /** * Clone project. * * @return project copy diff --git a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java index 830dfaa..ec03a86 100644 --- a/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java +++ b/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java @@ -205,15 +205,7 @@ public class TimerTaskHelper { result.addAll(getTaskPath(task.getParent())); result.add(task.getName()); } else { - if (((TimerProject) task).isSynchronized()) { - - // FIXME substring should not be here - result.add(task.getName().substring( - TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX - .length())); - } else { - result.add(task.getName()); - } + result.add(task.getName()); } return result; } diff --git a/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellComponent.java b/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellComponent.java index 532fe53..38629cc 100644 --- a/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellComponent.java +++ b/src/main/java/org/chorem/jtimer/ui/tree/CheckBoxTreeCellComponent.java @@ -2,7 +2,7 @@ * #%L * jTimer * %% - * Copyright (C) 2009 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2009 - 2016 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as @@ -30,7 +30,6 @@ import javax.swing.JCheckBox; import javax.swing.JTree; import org.chorem.jtimer.data.TimerCore; -import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; /** @@ -88,17 +87,8 @@ public abstract class CheckBoxTreeCellComponent extends JCheckBox { if (value instanceof TimerTask) { TimerTask task = (TimerTask) value; - // add style in project in sync - String taskName = task.getName(); - if (task instanceof TimerProject - && ((TimerProject) task).isSynchronized()) { - taskName = taskName - .substring(TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX - .length()); - } - // task name should not be "null" - this.setText(taskName); + this.setText(task.getName()); // add color if task is closed if (task.isClosed()) { diff --git a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java index 1971f5a..33718fd 100644 --- a/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java +++ b/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java @@ -24,12 +24,10 @@ package org.chorem.jtimer.ui.treetable; import java.awt.Color; import java.awt.Component; -import java.awt.Font; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; /** @@ -60,17 +58,8 @@ public class ProjectsAndTasksCellRenderer extends DefaultTreeCellRenderer { if (value instanceof TimerTask) { TimerTask task = (TimerTask) value; - // add style in project in sync - String taskName = task.getName(); - if (task instanceof TimerProject - && ((TimerProject) task).isSynchronized()) { - taskName = taskName - .substring(TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX - .length()); - } - // task name should not be "null" - localValue = taskName; + localValue = task.getName(); } // le fait en 2 temps car sinon, on voit de temps en temps @@ -84,14 +73,6 @@ public class ProjectsAndTasksCellRenderer extends DefaultTreeCellRenderer { if (value instanceof TimerTask) { TimerTask task = (TimerTask) value; - // add style in project in sync - if (task instanceof TimerProject - && ((TimerProject) task).isSynchronized()) { - setFont(getFont().deriveFont(Font.ITALIC)); - } else { - setFont(getFont().deriveFont(Font.PLAIN)); - } - // add color if task is closed if (task.isClosed()) { // fix selection color diff --git a/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java b/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java index 0dc0d0a..1c0ffb3 100644 --- a/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java +++ b/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java @@ -47,20 +47,6 @@ public class TimerProjectTest extends AbstractJTimerTest { project.setName("test"); Assert.assertEquals("test", project.getName()); - Assert.assertFalse(project.isSynchronized()); - } - - /** - * Test project sync. - */ - @Test - public void testProjectSynchronized() { - - TimerProject project = new TimerProject(TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX + "test"); - - Assert.assertEquals(TimerProject.SYNCHRONIZED_PROJECT_NAME_PREFIX - + "test", project.getName()); - Assert.assertTrue(project.isSynchronized()); } /** -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.