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

r2685 - trunk/src/test/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org 03 Nov '09

03 Nov '09

Author: echatellier Date: 2009-11-03 10:02:26 +0100 (Tue, 03 Nov 2009) New Revision: 2685 Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java Log: Fix compilation warning Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2009-11-03 08:49:15 UTC (rev 2684) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2009-11-03 09:02:26 UTC (rev 2685) @@ -99,8 +99,8 @@ TimerTask clonedTask = task.clone(); - Assert.assertTrue(clonedTask.allDaysAndTimes instanceof DailySortedMap, "Clone put invalid type for map"); - Assert.assertFalse(clonedTask.allDaysAnnotations instanceof DailySortedMap, "Clone put invalid type for map"); + Assert.assertTrue(clonedTask.allDaysAndTimes instanceof DailySortedMap<?>, "Clone put invalid type for map"); + Assert.assertFalse(clonedTask.allDaysAnnotations instanceof DailySortedMap<?>, "Clone put invalid type for map"); } /**

1 0

r2684 - trunk
by echatellier＠users.chorem.org 03 Nov '09

03 Nov '09

Author: echatellier Date: 2009-11-03 09:49:15 +0100 (Tue, 03 Nov 2009) New Revision: 2684 Modified: trunk/changelog.txt trunk/pom.xml Log: Swingx version bump. Move swing worker exclusion to swingx. Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-11-02 17:06:20 UTC (rev 2683) +++ trunk/changelog.txt 2009-11-03 08:49:15 UTC (rev 2684) @@ -3,10 +3,13 @@ jTimer (1.3.1) stable; urgency=low + * Readd jnlp launch * Fix systray popup menu not closed on focus lost * Force task selection on right clic * 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) * JNA version bump : 3.2.3 -- chatellier -- jeu. oct. 15 11:08:23 CEST 2009 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 17:06:20 UTC (rev 2683) +++ trunk/pom.xml 2009-11-03 08:49:15 UTC (rev 2684) @@ -296,20 +296,20 @@ <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.jdesktop</groupId> + <groupId>org.swinglabs</groupId> <artifactId>swing-worker</artifactId> </exclusion> </exclusions> </dependency> <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx</artifactId> - <version>1.0</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> <version>3.2.3</version>

1 0

r2683 - trunk
by echatellier＠users.chorem.org 02 Nov '09

02 Nov '09

Author: echatellier Date: 2009-11-02 18:06:20 +0100 (Mon, 02 Nov 2009) New Revision: 2683 Modified: trunk/pom.xml Log: Restore checktyle exclusion. Readd jnlp launcher. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 04:26:07 UTC (rev 2682) +++ trunk/pom.xml 2009-11-02 17:06:20 UTC (rev 2683) @@ -186,19 +186,6 @@ <configuration> <descriptors> <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>false</attach> - <appendAssemblyId>false</appendAssemblyId> - </configuration> - </execution> - <execution> - <id>assembly-src</id> - <phase>package</phase> - <goals> - <goal>single</goal> - </goals> - <configuration> - <descriptors> <descriptor>src/main/assembly/src.xml</descriptor> </descriptors> <attach>false</attach> @@ -211,14 +198,14 @@ <reporting> <plugins> -  <configuration> - <configLocation>checkstyle.xml</configLocation> - <excludes>**/Xss.java,**/X11.java</excludes> +  + <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java</excludes> </configuration> - </plugin> --> + </plugin> <plugin> <artifactId>maven-project-info-reports-plugin</artifactId>  @@ -244,7 +231,7 @@ </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.5</version> + <version>2.6.1</version> <configuration> <links> <link>http://java.sun.com/javase/6/docs/api/</link> @@ -395,7 +382,7 @@ </dependency> </dependencies> -  + </profiles> <repositories> <repository>

1 0

r2682 - trunk
by tchemit＠users.chorem.org 02 Nov '09

02 Nov '09

Author: tchemit Date: 2009-11-02 05:26:07 +0100 (Mon, 02 Nov 2009) New Revision: 2682 Modified: trunk/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target .settings .project .classpath JTimer.properties THIRD-PARTY.txt *testng*.xml + target .settings .project .classpath JTimer.properties THIRD-PARTY.txt *testng*.xml *.ipr *.iws *.iml

1 0