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

r2716 - trunk/src/main/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org Dec. 18, 2009

Dec. 18, 2009

Author: echatellier Date: 2009-12-18 10:11:04 +0100 (Fri, 18 Dec 2009) New Revision: 2716 Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java Log: Remove hashCode (temporary) need to be improved. Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2009-12-18 09:03:22 UTC (rev 2715) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2009-12-18 09:11:04 UTC (rev 2716) @@ -328,7 +328,9 @@ /* * @see java.lang.Object#hashCode() - */ + * + * TODO must be added, but cause some errors on tree cell renderer. + * @Override public int hashCode() { final int prime = 31; @@ -342,7 +344,7 @@ result = prime * result + number; result = prime * result + ((subTasks == null) ? 0 : subTasks.hashCode()); return result; - } + }*/ /* * @see java.lang.Object#equals(java.lang.Object)

1 0

r2715 - trunk
by echatellier＠users.chorem.org Dec. 18, 2009

Dec. 18, 2009

Author: echatellier Date: 2009-12-18 10:03:22 +0100 (Fri, 18 Dec 2009) New Revision: 2715 Modified: trunk/changelog.txt trunk/pom.xml Log: Move trunk to 1.3.x Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-12-18 08:55:56 UTC (rev 2714) +++ trunk/changelog.txt 2009-12-18 09:03:22 UTC (rev 2715) @@ -1,6 +1,15 @@ Changelog ========= +jTimer (1.3.2) stable; urgency=low + + * Allow adding notes on synchronized projects + * #80 : Add parent node to select/unselect all projects on report UI + * Freemarker updated to 2.3.16 + * JNA updated to 3.2.4 + + -- chatellier -- ven. déc. 18 09:54:03 CET 2009 + jTimer (1.3.1) stable; urgency=low * #76 : Add "Stop all tasks" action in systray popup menu Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-18 08:55:56 UTC (rev 2714) +++ trunk/pom.xml 2009-12-18 09:03:22 UTC (rev 2715) @@ -4,7 +4,7 @@ <groupId>org.chorem</groupId> <artifactId>jtimer</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.3.2-SNAPSHOT</version> <packaging>jar</packaging> <name>jTimer</name>

1 0

r2714 - trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc
by echatellier＠users.chorem.org Dec. 18, 2009

Dec. 18, 2009

Author: echatellier Date: 2009-12-18 09:55:56 +0100 (Fri, 18 Dec 2009) New Revision: 2714 Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java Log: Allow notes adding on synchronized projects Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java 2009-12-10 09:05:36 UTC (rev 2713) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java 2009-12-18 08:55:56 UTC (rev 2714) @@ -847,16 +847,15 @@ @Override public void checkSetAnnotation(TimerTask task, Date date, String annotation) { - TimerProject project = TimerTaskHelper.getTaskProject(task); + /*TimerProject project = TimerTaskHelper.getTaskProject(task); - // TODO allow for today if (project.isSynchronized()) { if (log.isDebugEnabled()) { log.debug("Project is synchronized, checkSetAnnotation won't pass"); } throw new DataViolationException("Can't set annotation", "vetoable.ws.chorem.cant.modify.synchronized.project"); - } + }*/ } /** @@ -864,18 +863,7 @@ */ @Override public void setAnnotation(TimerTask task, Date date, String annotation) { - if (task != null - && TimerTaskHelper.getTaskProject(task).isSynchronized()) { - // TODO: assert that calendar date is before today - - if (log.isDebugEnabled()) { - log.debug(task.getName() + " (" + date + ": annotation=" - + annotation + ")"); - } - - // not implemented so raise no error - } } /** @@ -1066,8 +1054,7 @@ .getTaskProject(otherTask); if (otherProject.isSynchronized()) { if (log.isDebugEnabled()) { - log - .debug("Project is synchronized, checkMergeTask won't pass"); + log.debug("Project is synchronized, checkMergeTask won't pass"); } throw new DataViolationException("Can't modify task", "vetoable.ws.chorem.cant.modify.synchronized.project");

1 0

r2713 - trunk
by echatellier＠users.chorem.org Dec. 10, 2009

Dec. 10, 2009

Author: echatellier Date: 2009-12-10 10:05:36 +0100 (Thu, 10 Dec 2009) New Revision: 2713 Modified: trunk/pom.xml Log: Use freemarker 2.3.16 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-09 16:42:13 UTC (rev 2712) +++ trunk/pom.xml 2009-12-10 09:05:36 UTC (rev 2713) @@ -393,7 +393,7 @@ <dependency> <groupId>org.freemarker</groupId> <artifactId>freemarker</artifactId> - <version>2.3.15</version> + <version>2.3.16</version> </dependency> <dependency> <groupId>org.apache.xmlrpc</groupId>

1 0

r2712 - trunk/src/main/java/org/chorem/jtimer/ui/system
by echatellier＠users.chorem.org Dec. 9, 2009

Dec. 9, 2009

Author: echatellier Date: 2009-12-09 17:42:13 +0100 (Wed, 09 Dec 2009) New Revision: 2712 Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java Log: Test os name in lower case. Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java 2009-12-09 16:39:20 UTC (rev 2711) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java 2009-12-09 16:42:13 UTC (rev 2712) @@ -59,7 +59,7 @@ throws UnsupportedSystemInfoException { if (instance == null) { - String os = System.getProperty("os.name"); + String os = System.getProperty("os.name").toLowerCase(); // log it if (log.isInfoEnabled()) { @@ -67,9 +67,9 @@ } // try windows - if (os.contains("Windows")) { + if (os.contains("windows")) { instance = new Win32SystemInfo(); - } else if (os.contains("Linux") || os.contains("Mac OS")) { + } else if (os.contains("linux") || os.contains("mac os")) { instance = new UnixSystemInfo(); } else { // system unknown

1 0

r2711 - trunk
by echatellier＠users.chorem.org Dec. 9, 2009

Dec. 9, 2009

Author: echatellier Date: 2009-12-09 17:39:20 +0100 (Wed, 09 Dec 2009) New Revision: 2711 Modified: trunk/checkstyle.xml Log: Improve checkstyle Modified: trunk/checkstyle.xml =================================================================== --- trunk/checkstyle.xml 2009-12-09 16:29:16 UTC (rev 2710) +++ trunk/checkstyle.xml 2009-12-09 16:39:20 UTC (rev 2711) @@ -1,19 +1,17 @@ <?xml version="1.0"?> <!DOCTYPE module PUBLIC - "-//Puppy Crawl//DTD Check Configuration 1.2//EN" - "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> + "-//Puppy Crawl//DTD Check Configuration 1.3//EN" + "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> <module name="Checker">  - <metadata name="com.atlas-sw.eclipse" value="I like Sydney"/> - <property name="severity" value="error"/>  <module name="RegexpSingleline"> + <property name="severity" value="info" /> <property name="format" value="^[^\*]*\s+$"/> <property name="minimum" value="0"/> <property name="maximum" value="0"/> @@ -74,7 +73,7 @@ </module> <module name="JavadocVariable"/> <module name="JavadocStyle"> - <property name="scope" value="public"/> + <property name="scope" value="protected"/> </module> <module name="LeftCurly"> @@ -88,7 +87,7 @@ <module name="OuterTypeNumber"/> <module name="LineLength"> - <property name="severity" value="warning" /> + <property name="severity" value="info" /> <property name="ignorePattern" value="^ *\* *[^ ]+$"/> </module> @@ -103,7 +102,7 @@ <module name="ModifierOrder"/> <module name="NeedBraces"/> <module name="NoWhitespaceAfter"> - <property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" /> + <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" /> </module> <module name="NoWhitespaceBefore"/>

1 0

r2710 - trunk/src/main/java/org/chorem/jtimer/ui/system/win32
by echatellier＠users.chorem.org Dec. 9, 2009

Dec. 9, 2009

Author: echatellier Date: 2009-12-09 17:29:16 +0100 (Wed, 09 Dec 2009) New Revision: 2710 Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Kernel32.java trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java Log: Refactor to be more compliant with jna convention. Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Kernel32.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Kernel32.java 2009-12-08 16:30:21 UTC (rev 2709) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Kernel32.java 2009-12-09 16:29:16 UTC (rev 2710) @@ -18,6 +18,7 @@ package org.chorem.jtimer.ui.system.win32; +import com.sun.jna.Native; import com.sun.jna.win32.StdCallLibrary; /** @@ -31,6 +32,9 @@ */ public interface Kernel32 extends StdCallLibrary { + /** Instance. */ + Kernel32 INSTANCE = (Kernel32) Native.loadLibrary("kernel32", Kernel32.class); + /** * Retrieves the number of milliseconds that have elapsed since the system * was started. Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2009-12-08 16:30:21 UTC (rev 2709) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2009-12-09 16:29:16 UTC (rev 2710) @@ -18,6 +18,7 @@ package org.chorem.jtimer.ui.system.win32; +import com.sun.jna.Native; import com.sun.jna.Structure; import com.sun.jna.win32.StdCallLibrary; @@ -34,6 +35,9 @@ */ public interface User32 extends StdCallLibrary { + /** Instance. */ + User32 INSTANCE = (User32) Native.loadLibrary("user32", User32.class); + /** * Contains the time of the last input. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java 2009-12-08 16:30:21 UTC (rev 2709) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java 2009-12-09 16:29:16 UTC (rev 2710) @@ -20,8 +20,6 @@ import org.chorem.jtimer.ui.system.SystemInfo; -import com.sun.jna.Native; - /** * Win32 System info. * @@ -35,10 +33,7 @@ */ public class Win32SystemInfo implements SystemInfo { - protected Kernel32 k32Instance; - - protected User32 u32Instance; - + /** User32 {@link lastInputInfo}. */ protected User32.LASTINPUTINFO lastInputInfo; /** @@ -47,8 +42,6 @@ * Package visibility */ public Win32SystemInfo() { - k32Instance = (Kernel32) Native.loadLibrary("kernel32", Kernel32.class); - u32Instance = (User32) Native.loadLibrary("user32", User32.class); lastInputInfo = new User32.LASTINPUTINFO(); } @@ -59,8 +52,8 @@ * @return idle time in milliseconds */ public int getIdleTimeMillisWin32() { - u32Instance.GetLastInputInfo(lastInputInfo); - return k32Instance.GetTickCount() - lastInputInfo.dwTime; + User32.INSTANCE.GetLastInputInfo(lastInputInfo); + return Kernel32.INSTANCE.GetTickCount() - lastInputInfo.dwTime; } /*

1 0

r2709 - trunk/src/main/resources
by echatellier＠users.chorem.org Dec. 8, 2009

Dec. 8, 2009

Author: echatellier Date: 2009-12-08 17:30:21 +0100 (Tue, 08 Dec 2009) New Revision: 2709 Modified: trunk/src/main/resources/log4j.properties Log: Use 24h file format Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2009-12-08 13:18:04 UTC (rev 2708) +++ trunk/src/main/resources/log4j.properties 2009-12-08 16:30:21 UTC (rev 2709) @@ -4,7 +4,7 @@ # Console output... log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n +log4j.appender.stdout.layout.ConversionPattern=%d{yyyy/MM/dd HH:mm:ss} %5p (%F:%L) %m%n # File output... #log4j.appender.fileout=org.apache.log4j.FileAppender

1 0

r2708 - trunk
by echatellier＠users.chorem.org Dec. 8, 2009

Dec. 8, 2009

Author: echatellier Date: 2009-12-08 14:18:04 +0100 (Tue, 08 Dec 2009) New Revision: 2708 Modified: trunk/pom.xml Log: Fix maven exec plugin launch Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-08 08:56:12 UTC (rev 2707) +++ trunk/pom.xml 2009-12-08 13:18:04 UTC (rev 2708) @@ -108,7 +108,7 @@ <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> + <exec.mainClass>org.chorem.jtimer.JTimer</exec.mainClass> <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> </properties> @@ -139,7 +139,7 @@ <archive> <manifest> <addClasspath>true</addClasspath> - <mainClass>${jtimer.main.class}</mainClass> + <mainClass>${exec.mainClass}</mainClass> <classpathPrefix>lib/</classpathPrefix> </manifest> </archive> @@ -435,7 +435,7 @@ <configuration> <libPath>lib</libPath> <jnlp> - <mainClass>${jtimer.main.class}</mainClass> + <mainClass>${exec.mainClass}</mainClass> </jnlp> <sign> <keystore>${keystorepath}</keystore>

1 0

r2707 - trunk/src/main/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org Dec. 8, 2009

Dec. 8, 2009

Author: echatellier Date: 2009-12-08 09:56:12 +0100 (Tue, 08 Dec 2009) New Revision: 2707 Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java Log: Add hashCode() function redefinition. Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2009-12-07 18:20:59 UTC (rev 2706) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2009-12-08 08:56:12 UTC (rev 2707) @@ -327,6 +327,24 @@ } /* + * @see java.lang.Object#hashCode() + */ + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((alerts == null) ? 0 : alerts.hashCode()); + result = prime * result + ((allDaysAndTimes == null) ? 0 : allDaysAndTimes.hashCode()); + result = prime * result + ((allDaysAnnotations == null) ? 0 : allDaysAnnotations.hashCode()); + result = prime * result + (closed ? 1231 : 1237); + result = prime * result + ((creationDate == null) ? 0 : creationDate.hashCode()); + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + number; + result = prime * result + ((subTasks == null) ? 0 : subTasks.hashCode()); + return result; + } + + /* * @see java.lang.Object#equals(java.lang.Object) */ @Override

1 0