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

r2705 - trunk/src/test/java/org/chorem/jtimer/ui/system
by echatellier＠users.chorem.org 25 Nov '09

25 Nov '09

Author: echatellier Date: 2009-11-25 09:43:35 +0100 (Wed, 25 Nov 2009) New Revision: 2705 Modified: trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java Log: Can't error that can happen when xvfb x server is available Modified: trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java 2009-11-20 16:30:09 UTC (rev 2704) +++ trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java 2009-11-25 08:43:35 UTC (rev 2705) @@ -41,7 +41,7 @@ /** log. */ private static Log log = LogFactory.getLog(ReportGeneratorTest.class); - + /** * Test to get system info. * @@ -52,16 +52,20 @@ public void getSystemInfoTest() { try { SystemInfo systemInfo = SystemInfoFactory.getSystemInfo(); - + Assert.assertTrue(systemInfo.getIdleTime() >= 0, "Idle time must be positive"); - } - catch(UnsupportedSystemInfoException e) { - + } catch (UnsupportedSystemInfoException e) { // can happen if (log.isInfoEnabled()) { log.info("No system info available in system, skip test"); } + } catch (UnsatisfiedLinkError e) { + // can happen on system where libX11 is available + // libXss is not (on xvfb x server for example) + if (log.isWarnEnabled()) { + log.warn("Can't initialize native system librairies", e); + } } } }

1 0

r2704 - trunk
by echatellier＠users.chorem.org 20 Nov '09

20 Nov '09

Author: echatellier Date: 2009-11-20 17:30:09 +0100 (Fri, 20 Nov 2009) New Revision: 2704 Modified: trunk/pom.xml Log: Update jna Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-20 10:02:02 UTC (rev 2703) +++ trunk/pom.xml 2009-11-20 16:30:09 UTC (rev 2704) @@ -339,7 +339,7 @@ <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>3.2.3</version> + <version>3.2.4</version> <scope>compile</scope> </dependency> <dependency>

1 0

r2703 - in trunk/src/main: java/org/chorem/jtimer/ui/report java/org/chorem/jtimer/ui/report/tree resources/org/chorem/jtimer/ui/report/resources
by echatellier＠users.chorem.org 20 Nov '09

20 Nov '09

Author: echatellier Date: 2009-11-20 11:02:02 +0100 (Fri, 20 Nov 2009) New Revision: 2703 Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellComponent.java trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellRenderer.java trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties Log: #80 : Pour la generation des rapports, pouvoir deselectionner tous les projets Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2009-11-19 09:39:15 UTC (rev 2702) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2009-11-20 10:02:02 UTC (rev 2703) @@ -260,12 +260,12 @@ panelProjects.add(showHiddenProjectBox, BorderLayout.NORTH); projectsTree = new JTree(); - projectsTree.setRootVisible(false); + projectsTree.setRootVisible(true); projectsTree.setEditable(true); - projectsTree.setModel(new CheckBoxTreeModel(core)); - projectsTree.setCellEditor(new CheckBoxTreeCellEditor(projectsTree, + projectsTree.setModel(new CheckBoxTreeModel(core, getResourceMap().getString("reportProjectsList") + " :")); + projectsTree.setCellEditor(new CheckBoxTreeCellEditor(core, projectsTree, uncheckedTaskSet)); - projectsTree.setCellRenderer(new CheckBoxTreeCellRenderer(projectsTree, + projectsTree.setCellRenderer(new CheckBoxTreeCellRenderer(core, projectsTree, uncheckedTaskSet)); JScrollPane jspTable = new JScrollPane(projectsTree); Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellComponent.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellComponent.java 2009-11-19 09:39:15 UTC (rev 2702) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellComponent.java 2009-11-20 10:02:02 UTC (rev 2703) @@ -25,6 +25,7 @@ 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; @@ -41,15 +42,26 @@ /** serialVersionUID */ private static final long serialVersionUID = 2497464481840318274L; + + /** Timer core. */ + protected TimerCore core; /** Parent tree. */ protected JTree parentTree; /** Unchecked task set. */ protected Set<TimerTask> uncheckedTaskSet; - - public CheckBoxTreeCellComponent(JTree parentTree, + + /** + * Constructor. + * + * @param core core reference + * @param parentTree tree reference + * @param uncheckedTaskList common unselected tasks list + */ + protected CheckBoxTreeCellComponent(TimerCore core, JTree parentTree, Set<TimerTask> uncheckedTaskList) { + this.core = core; this.parentTree = parentTree; this.uncheckedTaskSet = uncheckedTaskList; } Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java 2009-11-19 09:39:15 UTC (rev 2702) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java 2009-11-20 10:02:02 UTC (rev 2703) @@ -35,6 +35,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.jtimer.data.TimerCore; +import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; /** @@ -57,16 +59,17 @@ /** {@link CellEditorListener}s */ protected Collection<CellEditorListener> cellEditorListeners; - + /** * Constructor. * - * @param parentTree - * @param uncheckedTaskList + * @param core core + * @param parentTree tree + * @param uncheckedTaskList common unselected tasks list */ - public CheckBoxTreeCellEditor(JTree parentTree, + public CheckBoxTreeCellEditor(TimerCore core, JTree parentTree, Set<TimerTask> uncheckedTaskList) { - super(parentTree, uncheckedTaskList); + super(core, parentTree, uncheckedTaskList); addItemListener(this); cellEditorListeners = new ArrayList<CellEditorListener>(); @@ -174,9 +177,18 @@ uncheckedTaskSet.add(lastPathComponent); } - for (TimerTask subtask : lastPathComponent.getSubTasks()) { - TreePath subTreePath = treePath.pathByAddingChild(subtask); - updateChildreen(subTreePath, select); + // special case, root node selection + if (parentTree.getModel().getRoot() == lastPathComponent) { + for (TimerProject project : core.getData().getProjectsList()) { + TreePath subTreePath = treePath.pathByAddingChild(project); + updateChildreen(subTreePath, select); + } } + else { + for (TimerTask subtask : lastPathComponent.getSubTasks()) { + TreePath subTreePath = treePath.pathByAddingChild(subtask); + updateChildreen(subTreePath, select); + } + } } } Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellRenderer.java 2009-11-19 09:39:15 UTC (rev 2702) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellRenderer.java 2009-11-20 10:02:02 UTC (rev 2703) @@ -24,6 +24,7 @@ import javax.swing.JTree; import javax.swing.tree.TreeCellRenderer; +import org.chorem.jtimer.data.TimerCore; import org.chorem.jtimer.entities.TimerTask; /** @@ -41,9 +42,16 @@ /** serialVersionUID */ private static final long serialVersionUID = 2497464481840318274L; - public CheckBoxTreeCellRenderer(JTree parentTree, + /** + * Constructor. + * + * @param core core + * @param parentTree tree + * @param uncheckedTaskList common unselected tasks list + */ + public CheckBoxTreeCellRenderer(TimerCore core, JTree parentTree, Set<TimerTask> uncheckedTaskList) { - super(parentTree, uncheckedTaskList); + super(core, parentTree, uncheckedTaskList); } @Override Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2009-11-19 09:39:15 UTC (rev 2702) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2009-11-20 10:02:02 UTC (rev 2703) @@ -66,10 +66,11 @@ * Constructor. * * @param core core + * @param rootName root node name */ - public CheckBoxTreeModel(TimerCore core) { + public CheckBoxTreeModel(TimerCore core, String rootName) { this.core = core; - root = new TimerTask("Root"); + root = new TimerTask(rootName); modelSupport = new TreeModelSupport(this); } Modified: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2009-11-19 09:39:15 UTC (rev 2702) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2009-11-20 10:02:02 UTC (rev 2703) @@ -11,6 +11,7 @@ reportAnnotations=Include annotations reportProjects=Projects reportContent=Report +reportProjectsList=Projects list showHiddenProjects.Action.text = Show hidden projects showHiddenProjects.Action.shortDescription = Show hidden projects Modified: trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2009-11-19 09:39:15 UTC (rev 2702) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2009-11-20 10:02:02 UTC (rev 2703) @@ -11,6 +11,7 @@ reportAnnotations=Inclure les annotations reportProjects=Projets reportContent=Rapport +reportProjectsList=Liste des projets showHiddenProjects.Action.text = Afficher les cach\u00E9s showHiddenProjects.Action.shortDescription = Afficher les cach\u00E9s

1 0

r2702 - trunk
by echatellier＠users.chorem.org 19 Nov '09

19 Nov '09

Author: echatellier Date: 2009-11-19 10:39:15 +0100 (Thu, 19 Nov 2009) New Revision: 2702 Modified: trunk/pom.xml Log: maven-checkstyle-plugin version bump 2.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-16 17:07:39 UTC (rev 2701) +++ trunk/pom.xml 2009-11-19 09:39:15 UTC (rev 2702) @@ -219,9 +219,9 @@ <plugins> <plugin> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> <configuration> -  + <configLocation>checkstyle.xml</configLocation> <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java</excludes> </configuration> </plugin>

1 0

r2701 - trunk
by echatellier＠users.chorem.org 16 Nov '09

16 Nov '09

Author: echatellier Date: 2009-11-16 18:07:39 +0100 (Mon, 16 Nov 2009) New Revision: 2701 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-16 17:07:36 UTC (rev 2700) +++ trunk/pom.xml 2009-11-16 17:07:39 UTC (rev 2701) @@ -4,7 +4,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.1</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <name>jTimer</name> @@ -80,9 +80,9 @@ </issueManagement> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.1</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.1</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.1</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> </scm> <ciManagement>

1 0

r2700 - in tags: . jtimer-1.3.1
by echatellier＠users.chorem.org 16 Nov '09

16 Nov '09

Author: echatellier Date: 2009-11-16 18:07:36 +0100 (Mon, 16 Nov 2009) New Revision: 2700 Added: tags/jtimer-1.3.1/ tags/jtimer-1.3.1/pom.xml Removed: tags/jtimer-1.3.1/pom.xml Log: [maven-release-plugin] copy for tag jtimer-1.3.1 Property changes on: tags/jtimer-1.3.1 ___________________________________________________________________ Added: svn:ignore + target .settings .project .classpath JTimer.properties THIRD-PARTY.txt *testng*.xml *.ipr *.iws *.iml Added: svn:mergeinfo + /branches/1.3.x:2624-2628 Deleted: tags/jtimer-1.3.1/pom.xml =================================================================== --- trunk/pom.xml 2009-11-16 09:39:06 UTC (rev 2698) +++ tags/jtimer-1.3.1/pom.xml 2009-11-16 17:07:36 UTC (rev 2700) @@ -1,489 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <groupId>org.chorem</groupId> - <artifactId>jtimer</artifactId> - <version>1.3.1-SNAPSHOT</version> - <packaging>jar</packaging> - - <name>jTimer</name> - <description>jTimer - Project time tracking and report generation tool.</description> - <url>http://maven-site.chorem.org/jtimer</url> - <inceptionYear>2007</inceptionYear> - - <organization> - <name>CodeLutin</name> - <url>http://www.codelutin.com/</url> - </organization> - - <licenses> - <license> - <name>GPL</name> - <url>http://www.gnu.org/licenses/gpl.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - - <mailingLists> - <mailingList> - <name>jtimer-commits</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</unsubscribe> - <post>jtimer-commits(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/jtimer-commits/</archive> - </mailingList> - - <mailingList> - <name>jtimer-devel</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</unsubscribe> - <post>jtimer-devel(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/jtimer-devel/</archive> - </mailingList> - - <mailingList> - <name>jtimer-users</name> - <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</subscribe> - <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</unsubscribe> - <post>jtimer-users(a)list.chorem.org</post> - <archive>http://list.chorem.org/pipermail/jtimer-users/</archive> - </mailingList> - </mailingLists> - - <developers> - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Stéphane Chorlet</name> - <id>schorlet</id> - <email>chorlet(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> - - <issueManagement> - <system>redmine</system> - <url>http://www.chorem.org/projects/jtimer/issues</url> - </issueManagement> - - <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> - </scm> - - <ciManagement> - <system>hudson</system> - <url>http://hudson.chorem.org</url> - </ciManagement> - - <distributionManagement> - <repository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/release</url> - </repository> - <snapshotRepository> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/maven/snapshot</url> - </snapshotRepository> - <site> - <id>nuiton</id> - <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/jtimer</url> - </site> - </distributionManagement> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> - <jtimer.main.class>org.chorem.jtimer.JTimer</jtimer.main.class> - <maven.compiler.source>1.6</maven.compiler.source> - <maven.compiler.target>1.6</maven.compiler.target> - </properties> - - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.properties</exclude> - </excludes> - </resource> - </resources> - - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>${jtimer.main.class}</mainClass> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.directory}/surefire-workdir</value> - </property> - </systemProperties> - </configuration> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - <configuration> - <locales>fr,en</locales> - </configuration> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.0-beta-3</version> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>create</goal> - </goals> - <configuration> - <format>{0,date,yyyy-MM-dd}</format> - <items> - <item>timestamp</item> - </items> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>assembly-bin</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - <descriptor>src/main/assembly/src.xml</descriptor> - </descriptors> - <attach>false</attach> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <reporting> - <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.3</version> - <configuration> -  - <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java</excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.1.2</version> - <configuration> - <developerConnection>${project.scm.connection}</developerConnection> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>cim</report> - <report>dependencies</report> - <report>dependency-convergence</report> - <report>dependency-management</report> - <report>issue-tracking</report> - <report>license</report> - <report>mailing-list</report> - <report>project-team</report> - <report>scm</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.6.1</version> - <configuration> - <links> - <link>http://java.sun.com/javase/6/docs/api/</link> - </links> - </configuration> - </plugin> - <plugin> - <artifactId>maven-changelog-plugin</artifactId> - <version>2.1</version> - <configuration> - <type>range</type> - <range>365</range> - </configuration> - </plugin> - <plugin> - <artifactId>maven-changes-plugin</artifactId> - <version>2.1</version> - <reportSets> - <reportSet> - <reports> - <report>changes-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.4</version> - <configuration> - <targetJdk>${maven.compiler.source}</targetJdk> - </configuration> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.1</version> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.4.3</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.codehaus.sonar-plugins</groupId> - <artifactId>maven-report</artifactId> - <version>0.1</version> - <configuration> - <sonar.host.url>http://hudson.chorem.org/sonar</sonar.host.url> - </configuration> - </plugin> - </plugins> - </reporting> - - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <scope>test</scope> - <classifier>jdk15</classifier> - </dependency> - <dependency> - <groupId>org.jdesktop</groupId> - <artifactId>appframework</artifactId> - <version>1.0.3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx</artifactId> - <version>1.6</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>org.swinglabs</groupId> - <artifactId>swing-worker</artifactId> - </exclusion> - <exclusion> - <groupId>com.jhlabs</groupId> - <artifactId>filters</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - <version>3.2.3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.15</version> - <scope>runtime</scope> - <exclusions> - <exclusion> - <groupId>javax.jms</groupId> - <artifactId>jms</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jmx</groupId> - <artifactId>jmxri</artifactId> - </exclusion> - <exclusion> - <groupId>com.sun.jdmk</groupId> - <artifactId>jmxtools</artifactId> - </exclusion> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.15</version> - </dependency> - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>3.1.2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - </dependencies> - - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2</version> - <executions> - <execution> - <phase>pre-site</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - <configuration> - <libPath>lib</libPath> - <jnlp> - <mainClass>${jtimer.main.class}</mainClass> - </jnlp> - <sign> - <keystore>${keystorepath}</keystore> - <storepass>${keystorepass}</storepass> - <alias>${keystorealias}</alias> - <verify>true</verify> - </sign> - <pack200>true</pack200> - <gzip>true</gzip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>extract-jnlp-archive</id> - <phase>site</phase> - <configuration> - <tasks> - <unzip src="${project.build.directory}/${project.build.finalName}.zip" dest="${project.reporting.outputDirectory}" /> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <repositories> - <repository> - <id>javanet.repository</id> - <url>http://download.java.net/maven/2/</url> - </repository> - <repository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </repository> - </repositories> - - <pluginRepositories> - <pluginRepository> - <id>nuiton.release</id> - <url>http://maven.nuiton.org/release</url> - </pluginRepository> - </pluginRepositories> -</project> Copied: tags/jtimer-1.3.1/pom.xml (from rev 2699, trunk/pom.xml) =================================================================== --- tags/jtimer-1.3.1/pom.xml (rev 0) +++ tags/jtimer-1.3.1/pom.xml 2009-11-16 17:07:36 UTC (rev 2700) @@ -0,0 +1,489 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <groupId>org.chorem</groupId> + <artifactId>jtimer</artifactId> + <version>1.3.1</version> + <packaging>jar</packaging> + + <name>jTimer</name> + <description>jTimer - Project time tracking and report generation tool.</description> + <url>http://maven-site.chorem.org/jtimer</url> + <inceptionYear>2007</inceptionYear> + + <organization> + <name>CodeLutin</name> + <url>http://www.codelutin.com/</url> + </organization> + + <licenses> + <license> + <name>GPL</name> + <url>http://www.gnu.org/licenses/gpl.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + + <mailingLists> + <mailingList> + <name>jtimer-commits</name> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-commits</unsubscribe> + <post>jtimer-commits(a)list.chorem.org</post> + <archive>http://list.chorem.org/pipermail/jtimer-commits/</archive> + </mailingList> + + <mailingList> + <name>jtimer-devel</name> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-devel</unsubscribe> + <post>jtimer-devel(a)list.chorem.org</post> + <archive>http://list.chorem.org/pipermail/jtimer-devel/</archive> + </mailingList> + + <mailingList> + <name>jtimer-users</name> + <subscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</subscribe> + <unsubscribe>http://list.chorem.org/cgi-bin/mailman/listinfo/jtimer-users</unsubscribe> + <post>jtimer-users(a)list.chorem.org</post> + <archive>http://list.chorem.org/pipermail/jtimer-users/</archive> + </mailingList> + </mailingLists> + + <developers> + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Stéphane Chorlet</name> + <id>schorlet</id> + <email>chorlet(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + + <issueManagement> + <system>redmine</system> + <url>http://www.chorem.org/projects/jtimer/issues</url> + </issueManagement> + + <scm> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.1</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.1</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.1</url> + </scm> + + <ciManagement> + <system>hudson</system> + <url>http://hudson.chorem.org</url> + </ciManagement> + + <distributionManagement> + <repository> + <id>nuiton</id> + <url>scpexe://chorem.org/var/lib/maven/release</url> + </repository> + <snapshotRepository> + <id>nuiton</id> + <url>scpexe://chorem.org/var/lib/maven/snapshot</url> + </snapshotRepository> + <site> + <id>nuiton</id> + <url>scpexe://chorem.org/var/lib/redmine-chorem/project-site/jtimer</url> + </site> + </distributionManagement> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputDirectory>UTF-8</project.reporting.outputDirectory> + <jtimer.main.class>org.chorem.jtimer.JTimer</jtimer.main.class> + <maven.compiler.source>1.6</maven.compiler.source> + <maven.compiler.target>1.6</maven.compiler.target> + </properties> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + </excludes> + </resource> + </resources> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>${jtimer.main.class}</mainClass> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemProperties> + <property> + <name>java.io.tmpdir</name> + <value>${project.build.directory}/surefire-workdir</value> + </property> + </systemProperties> + </configuration> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.0.1</version> + <configuration> + <locales>fr,en</locales> + </configuration> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>buildnumber-maven-plugin</artifactId> + <version>1.0-beta-3</version> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>create</goal> + </goals> + <configuration> + <format>{0,date,yyyy-MM-dd}</format> + <items> + <item>timestamp</item> + </items> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assembly-bin</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + <attach>false</attach> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <reporting> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.3</version> + <configuration> +  + <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java</excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>2.1.2</version> + <configuration> + <developerConnection>${project.scm.connection}</developerConnection> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>cim</report> + <report>dependencies</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + <report>issue-tracking</report> + <report>license</report> + <report>mailing-list</report> + <report>project-team</report> + <report>scm</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>2.6.1</version> + <configuration> + <links> + <link>http://java.sun.com/javase/6/docs/api/</link> + </links> + </configuration> + </plugin> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <version>2.1</version> + <configuration> + <type>range</type> + <range>365</range> + </configuration> + </plugin> + <plugin> + <artifactId>maven-changes-plugin</artifactId> + <version>2.1</version> + <reportSets> + <reportSet> + <reports> + <report>changes-report</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <version>2.4</version> + <configuration> + <targetJdk>${maven.compiler.source}</targetJdk> + </configuration> + </plugin> + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + <version>2.1</version> + </plugin> + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + <version>2.4.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.3</version> + </plugin> + <plugin> + <groupId>org.codehaus.sonar-plugins</groupId> + <artifactId>maven-report</artifactId> + <version>0.1</version> + <configuration> + <sonar.host.url>http://hudson.chorem.org/sonar</sonar.host.url> + </configuration> + </plugin> + </plugins> + </reporting> + + <dependencies> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <scope>test</scope> + <classifier>jdk15</classifier> + </dependency> + <dependency> + <groupId>org.jdesktop</groupId> + <artifactId>appframework</artifactId> + <version>1.0.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx</artifactId> + <version>1.6</version> + <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.swinglabs</groupId> + <artifactId>swing-worker</artifactId> + </exclusion> + <exclusion> + <groupId>com.jhlabs</groupId> + <artifactId>filters</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>3.2.3</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.15</version> + <scope>runtime</scope> + <exclusions> + <exclusion> + <groupId>javax.jms</groupId> + <artifactId>jms</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jmx</groupId> + <artifactId>jmxri</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.jdmk</groupId> + <artifactId>jmxtools</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.15</version> + </dependency> + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>3.1.2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <scope>runtime</scope> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2</version> + <executions> + <execution> + <phase>pre-site</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + <configuration> + <libPath>lib</libPath> + <jnlp> + <mainClass>${jtimer.main.class}</mainClass> + </jnlp> + <sign> + <keystore>${keystorepath}</keystore> + <storepass>${keystorepass}</storepass> + <alias>${keystorealias}</alias> + <verify>true</verify> + </sign> + <pack200>true</pack200> + <gzip>true</gzip> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>extract-jnlp-archive</id> + <phase>site</phase> + <configuration> + <tasks> + <unzip src="${project.build.directory}/${project.build.finalName}.zip" dest="${project.reporting.outputDirectory}" /> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <repositories> + <repository> + <id>javanet.repository</id> + <url>http://download.java.net/maven/2/</url> + </repository> + <repository> + <id>nuiton.release</id> + <url>http://maven.nuiton.org/release</url> + </repository> + </repositories> + + <pluginRepositories> + <pluginRepository> + <id>nuiton.release</id> + <url>http://maven.nuiton.org/release</url> + </pluginRepository> + </pluginRepositories> +</project>

1 0

r2699 - trunk
by echatellier＠users.chorem.org 16 Nov '09

16 Nov '09

Author: echatellier Date: 2009-11-16 18:07:31 +0100 (Mon, 16 Nov 2009) New Revision: 2699 Modified: trunk/pom.xml Log: [maven-release-plugin] prepare release jtimer-1.3.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-16 09:39:06 UTC (rev 2698) +++ trunk/pom.xml 2009-11-16 17:07:31 UTC (rev 2699) @@ -4,7 +4,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.3.1-SNAPSHOT</version> + <version>1.3.1</version> <packaging>jar</packaging> <name>jTimer</name> @@ -80,9 +80,9 @@ </issueManagement> <scm> - <connection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</connection> - <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/trunk</developerConnection> - <url>http://www.chorem.org/repositories/browse/jtimer/trunk</url> + <connection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.1</connection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/jtimer/tags/jtimer-1.3.1</developerConnection> + <url>http://www.chorem.org/repositories/browse/jtimer/tags/jtimer-1.3.1</url> </scm> <ciManagement>

1 0

r2698 - trunk/src/main/java/org/chorem/jtimer/ui/treetable
by echatellier＠users.chorem.org 16 Nov '09

16 Nov '09

Author: echatellier Date: 2009-11-16 10:39:06 +0100 (Mon, 16 Nov 2009) New Revision: 2698 Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java Log: Oula... :) Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2009-11-16 09:22:53 UTC (rev 2697) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2009-11-16 09:39:06 UTC (rev 2698) @@ -58,16 +58,15 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1383276150996517529L; - /** Looger. */ - private static Log log = LogFactory - .getLog(ProjectsAndTasksCellRenderer.class); + /** Logger. */ + private static Log log = LogFactory.getLog(ProjectsAndTasksCellRenderer.class); - /** Running tank icon. */ + /** Running task icon. */ protected ImageIcon runningIcon; - /** Taches en cours d'execution. **/ + /** Running tasks. */ protected Collection<TimerTask> runningTasks; - + /** * Constructor. *

1 0

r2697 - in trunk: . src/site/en/rst src/site/rst
by echatellier＠users.chorem.org 16 Nov '09

16 Nov '09

Author: echatellier Date: 2009-11-16 10:22:53 +0100 (Mon, 16 Nov 2009) New Revision: 2697 Modified: trunk/changelog.txt trunk/src/site/en/rst/releasenotes.rst trunk/src/site/rst/releasenotes.rst Log: Update changelog Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-11-16 09:22:41 UTC (rev 2696) +++ trunk/changelog.txt 2009-11-16 09:22:53 UTC (rev 2697) @@ -3,17 +3,21 @@ jTimer (1.3.1) stable; urgency=low - * Add multiples task move support + * #76 : Add "Stop all tasks" action in systray popup menu + * #50 : Display idle duration in idle dialog + * #20 : Modify label in idle dialog (and add icons) + * #12 : Idle detection now show only one frame even if multiples tasks are running + * #63 : Add multiples task move support * Readd jnlp launch - * Fix systray popup menu not closed on focus lost - * Force task selection on right clic - * Fix duration edition (task and alerts) + * #61 : Fix systray popup menu not closed on focus lost + * #59 : Force task selection on right click + * #52 : Fix duration edition (task and alerts) * Add icon into assembly archive * Fix NPE related to non available systray - * Swingx version bump : 1.6 (java 6, full nimbus support) + * Swingx version bump : 1.6 * JNA version bump : 3.2.3 - -- chatellier -- jeu. oct. 15 11:08:23 CEST 2009 + -- chatellier -- lun. nov. 16 10:09:47 CET 2009 jTimer (1.3.0) stable; urgency=low Modified: trunk/src/site/en/rst/releasenotes.rst =================================================================== --- trunk/src/site/en/rst/releasenotes.rst 2009-11-16 09:22:41 UTC (rev 2696) +++ trunk/src/site/en/rst/releasenotes.rst 2009-11-16 09:22:53 UTC (rev 2697) @@ -3,13 +3,21 @@ jTimer (1.3.1) stable; urgency=low - * Fix systray popup menu not closed on focus lost - * Force task selection on right clic - * Fix duration edition (task and alerts) + * #76 : Add "Stop all tasks" action in systray popup menu + * #50 : Display idle duration in idle dialog + * #20 : Modify label in idle dialog (and add icons) + * #12 : Idle detection now show only one frame even if multiples tasks are running + * #63 : Add multiples task move support + * Readd jnlp launch + * #61 : Fix systray popup menu not closed on focus lost + * #59 : Force task selection on right click + * #52 : Fix duration edition (task and alerts) + * Add icon into assembly archive * Fix NPE related to non available systray + * Swingx version bump : 1.6 * JNA version bump : 3.2.3 - -- chatellier -- jeu. oct. 15 11:08:23 CEST 2009 + -- chatellier -- lun. nov. 16 10:09:47 CET 2009 jTimer (1.3.0) stable; urgency=low Modified: trunk/src/site/rst/releasenotes.rst =================================================================== --- trunk/src/site/rst/releasenotes.rst 2009-11-16 09:22:41 UTC (rev 2696) +++ trunk/src/site/rst/releasenotes.rst 2009-11-16 09:22:53 UTC (rev 2697) @@ -3,13 +3,21 @@ jTimer (1.3.1) stable; urgency=low - * Fix systray popup menu not closed on focus lost - * Force task selection on right clic - * Fix duration edition (task and alerts) + * #76 : Add "Stop all tasks" action in systray popup menu + * #50 : Display idle duration in idle dialog + * #20 : Modify label in idle dialog (and add icons) + * #12 : Idle detection now show only one frame even if multiples tasks are running + * #63 : Add multiples task move support + * Readd jnlp launch + * #61 : Fix systray popup menu not closed on focus lost + * #59 : Force task selection on right click + * #52 : Fix duration edition (task and alerts) + * Add icon into assembly archive * Fix NPE related to non available systray + * Swingx version bump : 1.6 * JNA version bump : 3.2.3 - -- chatellier -- jeu. oct. 15 11:08:23 CEST 2009 + -- chatellier -- lun. nov. 16 10:09:47 CET 2009 jTimer (1.3.0) stable; urgency=low

1 0

r2696 - trunk/src/main/java/org/chorem/jtimer/ui/treetable
by echatellier＠users.chorem.org 16 Nov '09

16 Nov '09

Author: echatellier Date: 2009-11-16 10:22:41 +0100 (Mon, 16 Nov 2009) New Revision: 2696 Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java Log: Javadoc and useless commented code Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2009-11-16 09:22:22 UTC (rev 2695) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2009-11-16 09:22:41 UTC (rev 2696) @@ -55,21 +55,21 @@ public class ProjectsAndTasksCellRenderer extends DefaultTreeCellRenderer implements DataEventListener { - /** serialVersionUID */ + /** serialVersionUID. */ private static final long serialVersionUID = 1383276150996517529L; - /** log */ + /** Looger. */ private static Log log = LogFactory .getLog(ProjectsAndTasksCellRenderer.class); - /** runningIcon */ + /** Running tank icon. */ protected ImageIcon runningIcon; - /** Taches en cours d'execution **/ + /** Taches en cours d'execution. **/ protected Collection<TimerTask> runningTasks; - + /** - * Constructeur + * Constructor. * * @param core TimerCore */ @@ -79,8 +79,6 @@ // init runningTasks = new HashSet<TimerTask>(); - //runningIcon = Resource - // .getIcon("org/chorem/jtimer/resources/running.gif"); URL runnigIconUrl = ProjectsAndTasksCellRenderer.class .getResource("/org/chorem/jtimer/resources/running.gif"); runningIcon = new ImageIcon(runnigIconUrl); @@ -269,7 +267,7 @@ public void startTask(TimerTask task) { if (log.isDebugEnabled()) { - log.debug("propertyChange (start) on " + task.getName()); + log.debug("startTask on " + task.getName()); } // remember running task @@ -283,12 +281,11 @@ public void stopTask(TimerTask task) { if (log.isDebugEnabled()) { - log.debug("propertyChange (stop) on " + task.getName()); + log.debug("stopTask on " + task.getName()); } // remember don't running task runningTasks.remove(task); - } /*

1 0