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

r2684 - trunk
by echatellier＠users.chorem.org Nov. 3, 2009

Nov. 3, 2009

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 Nov. 2, 2009

Nov. 2, 2009

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 Nov. 2, 2009

Nov. 2, 2009

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

r2681 - in trunk: . src/site/en/rst src/site/rst
by echatellier＠users.chorem.org Oct. 26, 2009

Oct. 26, 2009

Author: echatellier Date: 2009-10-26 10:23:31 +0100 (Mon, 26 Oct 2009) New Revision: 2681 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-10-26 09:23:18 UTC (rev 2680) +++ trunk/changelog.txt 2009-10-26 09:23:31 UTC (rev 2681) @@ -4,7 +4,7 @@ jTimer (1.3.1) stable; urgency=low * Fix systray popup menu not closed on focus lost - * Force task selection on rigth clic + * Force task selection on right clic * Fix duration edition (task and alerts) * Fix NPE related to non available systray * JNA version bump : 3.2.3 Modified: trunk/src/site/en/rst/releasenotes.rst =================================================================== --- trunk/src/site/en/rst/releasenotes.rst 2009-10-26 09:23:18 UTC (rev 2680) +++ trunk/src/site/en/rst/releasenotes.rst 2009-10-26 09:23:31 UTC (rev 2681) @@ -3,7 +3,8 @@ jTimer (1.3.1) stable; urgency=low - * Force task selection on rigth clic + * Fix systray popup menu not closed on focus lost + * Force task selection on right clic * Fix duration edition (task and alerts) * Fix NPE related to non available systray * JNA version bump : 3.2.3 Modified: trunk/src/site/rst/releasenotes.rst =================================================================== --- trunk/src/site/rst/releasenotes.rst 2009-10-26 09:23:18 UTC (rev 2680) +++ trunk/src/site/rst/releasenotes.rst 2009-10-26 09:23:31 UTC (rev 2681) @@ -3,7 +3,8 @@ jTimer (1.3.1) stable; urgency=low - * Force task selection on rigth clic + * Fix systray popup menu not closed on focus lost + * Force task selection on right clic * Fix duration edition (task and alerts) * Fix NPE related to non available systray * JNA version bump : 3.2.3

1 0

r2680 - in trunk/src/test: java/org/chorem/jtimer/data java/org/chorem/jtimer/io resources/testdata
by echatellier＠users.chorem.org Oct. 26, 2009

Oct. 26, 2009

Author: echatellier Date: 2009-10-26 10:23:18 +0100 (Mon, 26 Oct 2009) New Revision: 2680 Added: trunk/src/test/resources/testdata/40.task Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java Log: Ajout d'un test sur les t?\195?\162ches sans projets parents (permit pas gtimer). Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-10-26 09:04:48 UTC (rev 2679) +++ trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2009-10-26 09:23:18 UTC (rev 2680) @@ -59,7 +59,7 @@ TimerProject project1 = findProject(projectsBefore, "Test project"); Assert.assertNull(project1); - Assert.assertEquals(projectsBefore.size(), 5); + Assert.assertEquals(projectsBefore.size(), 6); // add new project TimerProject project = new TimerProject("Test project"); @@ -75,7 +75,7 @@ TimerProject project1a = findProject(projectsAfter, "Test project"); Assert.assertNotNull(project1a); - Assert.assertEquals(projectsBefore.size(), 6); + Assert.assertEquals(projectsBefore.size(), 7); } /** @@ -128,7 +128,7 @@ TimerProject project1 = findProject(projectsBefore, "jTimer"); Assert.assertNotNull(project1); - Assert.assertEquals(projectsBefore.size(), 5); + Assert.assertEquals(projectsBefore.size(), 6); // delete project dataManager.deleteProject(project1); @@ -141,7 +141,7 @@ List<TimerProject> projectsAfter = dataManager.getProjectsList(); Assert.assertNull(findProject(projectsAfter, "jTimer")); - Assert.assertEquals(projectsAfter.size(), 4); + Assert.assertEquals(projectsAfter.size(), 5); } /** Modified: trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2009-10-26 09:04:48 UTC (rev 2679) +++ trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2009-10-26 09:23:18 UTC (rev 2680) @@ -34,6 +34,7 @@ import org.chorem.jtimer.entities.TimerAlert; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.entities.TimerTaskHelper; import org.testng.Assert; import org.testng.annotations.Test; @@ -91,8 +92,8 @@ Collection<TimerProject> projects = testSaver.load(); Assert.assertNotNull(projects); - Assert.assertEquals(getProjectsCount(projects), 5); - Assert.assertEquals(getTasksCount(projects), 39); + Assert.assertEquals(getProjectsCount(projects), 6); + Assert.assertEquals(getTasksCount(projects), 40); Assert.assertEquals(getAnnotationsCount(projects), 9); Assert.assertEquals(getAlertsCount(projects), 6); @@ -281,6 +282,7 @@ * * @throws IOException */ + @Test public void parseAlertsTest() throws IOException { /*try { @@ -313,4 +315,36 @@ } }*/ } + + /** + * Test que les taches sans projets parent (autorisé par gtimer) sont bien + * chargé par jtimer dans un projet nommé "No project". + * + * @throws IOException + */ + @Test + public void defaultProjectTest() throws IOException { + /*try { + //FIXME testSaver.lock();*/ + + GTimerIncrementalSaver gsaver = (GTimerIncrementalSaver) testSaver; + + // task to get annotation + Collection<TimerProject> projects = gsaver.load(); + + TimerProject project1 = findProject(projects, "No project"); + Assert.assertNotNull(project1); + + TimerTask task1 = findTask(projects, "No project/Test no parent project"); + Assert.assertNotNull(task1); + Assert.assertEquals(TimerTaskHelper.getAllTotalTime(task1), 9644); + + /*FIXME testSaver.unlock(); + } catch (DataLockingException e) { + if(log.isErrorEnabled()) { + log.error("parseAnnotations error", e); + Assert.fail(); + } + }*/ + } } Added: trunk/src/test/resources/testdata/40.task =================================================================== --- trunk/src/test/resources/testdata/40.task (rev 0) +++ trunk/src/test/resources/testdata/40.task 2009-10-26 09:23:18 UTC (rev 2680) @@ -0,0 +1,7 @@ +Format: 1.2 +Name: Test no parent project +Created: 1243600123 +Options: 0 +Project: -1 +Data: +20090131 9644

1 0

r2679 - in trunk: . src/main/java/org/chorem/jtimer/ui/systray src/main/java/org/chorem/jtimer/ui/widget
by echatellier＠users.chorem.org Oct. 26, 2009

Oct. 26, 2009

Author: echatellier Date: 2009-10-26 10:04:48 +0100 (Mon, 26 Oct 2009) New Revision: 2679 Added: trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java Modified: trunk/changelog.txt trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java Log: Fix systray popup menu not closed on focus lost Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-15 09:29:18 UTC (rev 2678) +++ trunk/changelog.txt 2009-10-26 09:04:48 UTC (rev 2679) @@ -3,6 +3,7 @@ jTimer (1.3.1) stable; urgency=low + * Fix systray popup menu not closed on focus lost * Force task selection on rigth clic * Fix duration edition (task and alerts) * Fix NPE related to non available systray Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-10-15 09:29:18 UTC (rev 2678) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2009-10-26 09:04:48 UTC (rev 2679) @@ -42,6 +42,7 @@ import org.chorem.jtimer.data.DataEventListener; import org.chorem.jtimer.entities.TimerProject; import org.chorem.jtimer.entities.TimerTask; +import org.chorem.jtimer.ui.widget.JPopupTrayIcon; import org.jdesktop.application.ApplicationContext; import org.jdesktop.application.ResourceManager; import org.jdesktop.application.ResourceMap; @@ -166,13 +167,10 @@ SystemTray tray = SystemTray.getSystemTray(); // construct a TrayIcon - trayIcon = new TrayIcon(idleImage, resourceMap.getString("tooltipIdleText"), null); + trayIcon = new JPopupTrayIcon(idleImage, resourceMap.getString("tooltipIdleText"), popup); trayIcon.setImageAutoSize(true); trayIcon.addMouseListener(this); - // add listener - //tray.addPropertyChangeListener("trayIcons", this); - // add the tray image try { tray.add(trayIcon); @@ -338,7 +336,7 @@ trayIcon.setImage(idleDetectImage); } } - + /** * Called by main application UI after idle detect. */ @@ -359,49 +357,6 @@ } /* - * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent) - * - public void propertyChange(PropertyChangeEvent evt) { - - // get event name - String event = evt.getPropertyName(); - - if (log.isDebugEnabled()) { - log.debug("Property change on system tray : " + event); - } - - if (evt.getNewValue() == null) { - if (log.isDebugEnabled()) { - log.debug("Disable tray icon"); - } - trayIcon = null; - } - else { - SystemTray tray = (SystemTray)evt.getSource(); - - boolean alreadyInTray = false; - TrayIcon[] installedIcons = tray.getTrayIcons(); - for (TrayIcon installedIcon : installedIcons) { - if (installedIcon.equals(trayIcon)) { - alreadyInTray = true; - } - } - - if (alreadyInTray) { - if (log.isDebugEnabled()) { - log.debug("Tray icon already installed"); - } - } - else { - if (log.isDebugEnabled()) { - log.debug("Install tray icons"); - } - EventQueue.invokeLater(this); - } - } - }/ - - /* * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent) */ public void actionPerformed(ActionEvent e) { @@ -537,12 +492,6 @@ @Override public void mouseReleased(MouseEvent e) { - // use sun workarround http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=6285881 - if (e.getClickCount() == 1 && e.getButton() == MouseEvent.BUTTON3) { - popup.setLocation(e.getX(), e.getY()); - popup.setInvoker(popup); - popup.setVisible(true); - } } /* Added: trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java (rev 0) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java 2009-10-26 09:04:48 UTC (rev 2679) @@ -0,0 +1,178 @@ +/* *##% + * Copyright (C) 2009 Code Lutin + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.chorem.jtimer.ui.widget; + +import java.awt.Dimension; +import java.awt.Frame; +import java.awt.GraphicsEnvironment; +import java.awt.Image; +import java.awt.Point; +import java.awt.TrayIcon; +import java.awt.Window; +import java.awt.event.MouseEvent; +import java.awt.event.MouseListener; + +import javax.swing.JDialog; +import javax.swing.JPopupMenu; +import javax.swing.JWindow; +import javax.swing.RootPaneContainer; +import javax.swing.event.PopupMenuEvent; +import javax.swing.event.PopupMenuListener; + +/** + * JPopupMenu compatible TrayIcon based on Alexander Potochkin's JXTrayIcon + * (http://weblogs.java.net/blog/alexfromsun/archive/2008/02/jtrayicon_updat.ht…) + * but uses a JWindow instead of a JDialog to workaround some bugs on linux. + * + * Use code based from, with some modifications : + * https://fishfarm.dev.java.net/source/browse/fishfarm/trunk/FishFarm/src/net… + * + * @author Michael Bien + * @author Chatellier Eric + */ +public class JPopupTrayIcon extends TrayIcon implements MouseListener, + PopupMenuListener { + + private JPopupMenu menu; + + private Window window; + + private final static boolean IS_WINDOWS = System.getProperty("os.name") + .toLowerCase().contains("windows"); + + public JPopupTrayIcon(Image image, String tooltip, JPopupMenu popup) { + super(image, tooltip); + addMouseListener(this); + setJPopupMenu(popup); + } + + protected void showJPopupMenu(MouseEvent e) { + if (e.isPopupTrigger() && menu != null) { + if (window == null) { + + if (IS_WINDOWS) { + window = new JDialog((Frame) null); + ((JDialog) window).setUndecorated(true); + } else { + window = new JWindow((Frame) null); + } + window.setAlwaysOnTop(true); + Dimension size = menu.getPreferredSize(); + + Point centerPoint = GraphicsEnvironment + .getLocalGraphicsEnvironment().getCenterPoint(); + if (e.getY() > centerPoint.getY()) { + window.setLocation(e.getX(), e.getY() - size.height); + } else { + window.setLocation(e.getX(), e.getY()); + } + + window.setVisible(true); + + menu.show(((RootPaneContainer) window).getContentPane(), 0, 0); + + // popup works only for focused windows + window.toFront(); + } + } + } + + public JPopupMenu getJPopupMenu() { + return menu; + } + + public void setJPopupMenu(JPopupMenu menu) { + if (this.menu != null) { + this.menu.removePopupMenuListener(this); + } + this.menu = menu; + menu.addPopupMenuListener(this); + } + + /* + * @see javax.swing.event.PopupMenuListener#popupMenuWillBecomeVisible(javax.swing.event.PopupMenuEvent) + */ + @Override + public void popupMenuWillBecomeVisible(PopupMenuEvent e) { + + } + + /* + * @see javax.swing.event.PopupMenuListener#popupMenuWillBecomeInvisible(javax.swing.event.PopupMenuEvent) + */ + @Override + public void popupMenuWillBecomeInvisible(PopupMenuEvent e) { + if (window != null) { + window.dispose(); + window = null; + } + } + + /* + * @see javax.swing.event.PopupMenuListener#popupMenuCanceled(javax.swing.event.PopupMenuEvent) + */ + @Override + public void popupMenuCanceled(PopupMenuEvent e) { + if (window != null) { + window.dispose(); + window = null; + } + } + + /* + * @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent) + */ + @Override + public void mouseClicked(MouseEvent e) { + + } + + /* + * @see java.awt.event.MouseListener#mouseEntered(java.awt.event.MouseEvent) + */ + @Override + public void mouseEntered(MouseEvent e) { + + } + + /* + * @see java.awt.event.MouseListener#mouseExited(java.awt.event.MouseEvent) + */ + @Override + public void mouseExited(MouseEvent e) { + + } + + /* + * @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent) + */ + @Override + public void mousePressed(MouseEvent e) { + showJPopupMenu(e); + + } + + /* + * @see java.awt.event.MouseListener#mouseReleased(java.awt.event.MouseEvent) + */ + @Override + public void mouseReleased(MouseEvent e) { + showJPopupMenu(e); + } +} Property changes on: trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL"

1 0

r2678 - in trunk: . src/site/en/rst src/site/rst
by echatellier＠users.chorem.org Oct. 15, 2009

Oct. 15, 2009

Author: echatellier Date: 2009-10-15 11:29:18 +0200 (Thu, 15 Oct 2009) New Revision: 2678 Modified: trunk/changelog.txt trunk/src/site/en/rst/releasenotes.rst trunk/src/site/rst/releasenotes.rst Log: Update site release notes Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-15 09:29:00 UTC (rev 2677) +++ trunk/changelog.txt 2009-10-15 09:29:18 UTC (rev 2678) @@ -7,9 +7,9 @@ * Fix duration edition (task and alerts) * Fix NPE related to non available systray * JNA version bump : 3.2.3 - - -- chatellier -- jeu. sept. 24 11:04:36 CEST 2009 + -- chatellier -- jeu. oct. 15 11:08:23 CEST 2009 + jTimer (1.3.0) stable; urgency=low * Fix saving project as task problem (project was appearing in projects subtask) Modified: trunk/src/site/en/rst/releasenotes.rst =================================================================== --- trunk/src/site/en/rst/releasenotes.rst 2009-10-15 09:29:00 UTC (rev 2677) +++ trunk/src/site/en/rst/releasenotes.rst 2009-10-15 09:29:18 UTC (rev 2678) @@ -1,6 +1,15 @@ Release notes ============= +jTimer (1.3.1) stable; urgency=low + + * Force task selection on rigth clic + * Fix duration edition (task and alerts) + * Fix NPE related to non available systray + * JNA version bump : 3.2.3 + + -- chatellier -- jeu. oct. 15 11:08:23 CEST 2009 + jTimer (1.3.0) stable; urgency=low * Fix saving project as task problem (project was appearing in projects subtask) Modified: trunk/src/site/rst/releasenotes.rst =================================================================== --- trunk/src/site/rst/releasenotes.rst 2009-10-15 09:29:00 UTC (rev 2677) +++ trunk/src/site/rst/releasenotes.rst 2009-10-15 09:29:18 UTC (rev 2678) @@ -1,6 +1,15 @@ Notes de version ================ +jTimer (1.3.1) stable; urgency=low + + * Force task selection on rigth clic + * Fix duration edition (task and alerts) + * Fix NPE related to non available systray + * JNA version bump : 3.2.3 + + -- chatellier -- jeu. oct. 15 11:08:23 CEST 2009 + jTimer (1.3.0) stable; urgency=low * Fix saving project as task problem (project was appearing in projects subtask)

1 0

r2677 - in trunk: . src/main/java/org/chorem/jtimer/data src/main/java/org/chorem/jtimer/entities
by echatellier＠users.chorem.org Oct. 15, 2009

Oct. 15, 2009

Author: echatellier Date: 2009-10-15 11:29:00 +0200 (Thu, 15 Oct 2009) New Revision: 2677 Modified: trunk/checkstyle.xml trunk/pom.xml trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java Log: Switch to checkstyle 5.0 (test requested by MCHECKSTYLE-105) Modified: trunk/checkstyle.xml =================================================================== --- trunk/checkstyle.xml 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/checkstyle.xml 2009-10-15 09:29:00 UTC (rev 2677) @@ -1,164 +1,186 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> +<?xml version="1.0"?> +<!DOCTYPE module PUBLIC + "-//Puppy Crawl//DTD Check Configuration 1.2//EN" + "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> + <module name="Checker"> +  -  -  + <property name="basedir" value="${basedir}"/> + --> -  -  - <module name="NewlineAtEndOfFile"/> + <metadata name="com.atlas-sw.eclipse" value="I like Sydney"/> -  -  - <module name="Translation"/> + <property name="severity" value="error"/> +  - <module name="TreeWalker"> + <module name="JavadocPackage"> + <property name="allowLegacy" value="false"/> + </module> - <property name="cacheFile" value="${checkstyle.cache.file}"/> +  -  -  - <module name="JavadocMethod"> - <property name="allowMissingJavadoc" value="true"/> - </module> - <module name="JavadocType"/> - <module name="JavadocVariable"/> - <module name="JavadocStyle"> - <property name="severity" value="warning"/> - </module> + <module name="FileTabCharacter"> + <property name="eachLine" value="false"/> + </module> + <module name="FileLength"> + <property name="fileExtensions" value="java"/> + </module> -  -  - <module name="ConstantName"/> - <module name="LocalFinalVariableName"/> - <module name="LocalVariableName"/> - <module name="MemberName"/> - <module name="MethodName"/> - <module name="PackageName"/> - <module name="ParameterName"/> - <module name="StaticVariableName"/> - <module name="TypeName"/> +  + <module name="RegexpSingleline"> + <property name="format" value="^[^\*]*\s+$"/> + <property name="minimum" value="0"/> + <property name="maximum" value="0"/> + </module> -  -  -  -  -  -  -  -  -  -  -  -  -  + <module name="TreeWalker"> + <property name="tabWidth" value="4" /> -  -  + <module name="AvoidStarImport"/> + <module name="ConstantName"/> + <module name="EmptyBlock"/> + <module name="EmptyForIteratorPad"/> + <module name="EqualsHashCode"/> +  + <module name="IllegalImport"/> + <module name="IllegalInstantiation"/> + <module name="IllegalThrows"/> + <module name="InnerAssignment"/> + <module name="JavadocType"> + <property name="authorFormat" value="\S"/> + </module> + <module name="JavadocMethod"> + <property name="allowUndeclaredRTE" value="true"/> + <property name="allowThrowsTagsForSubclasses" value="true"/> + </module> + <module name="JavadocVariable"/> + <module name="JavadocStyle"> + <property name="scope" value="public"/> + </module> -  -  - <module name="AvoidStarImport"/> - <module name="IllegalImport"/>  - <module name="RedundantImport"/> - <module name="UnusedImports"/> + <module name="LeftCurly"> + <property name="tokens" value="CLASS_DEF,INTERFACE_DEF,METHOD_DEF,CTOR_DEF"/> + <property name="option" value="eol"/> + </module> + <module name="LeftCurly"> + <property name="tokens" value="LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_SWITCH,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE"/> + <property name="option" value="eol"/> + </module> + <module name="OuterTypeNumber"/> + <module name="LineLength"> + <property name="severity" value="warning" /> + <property name="ignorePattern" value="^ *\* *[^ ]+$"/> + </module> -  -  - <module name="FileLength"/> - <module name="LineLength"> - <property name="severity" value="warning"/> - </module> - <module name="MethodLength"/> - <module name="ParameterNumber"/> + <module name="LocalFinalVariableName"/> + <module name="LocalVariableName"/> + <module name="MemberName"> + <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> + </module> + <module name="MethodLength"/> + <module name="MethodName"/> + <module name="MethodParamPad"/> + <module name="ModifierOrder"/> + <module name="NeedBraces"/> + <module name="NoWhitespaceAfter"> + <property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS" /> + </module> + <module name="NoWhitespaceBefore"/> + <module name="NoWhitespaceBefore"> + <property name="tokens" value="DOT"/> + <property name="allowLineBreaks" value="true"/> + </module> -  -  - <module name="EmptyForIteratorPad"/> - <module name="MethodParamPad"/> - <module name="NoWhitespaceAfter"/> - <module name="NoWhitespaceBefore"/> - <module name="OperatorWrap"/> - <module name="ParenPad"/> - <module name="TypecastParenPad"/> - <module name="TabCharacter"/> - <module name="WhitespaceAfter"/> - <module name="WhitespaceAround"/> + <module name="OperatorWrap"/> + <module name="OperatorWrap"> + <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/> + <property name="option" value="eol"/> + </module> + <module name="PackageName"/> + <module name="ParameterName"> + <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> + </module> + <module name="ParameterNumber"> + <property name="id" value="paramNum"/> + </module> + <module name="ParenPad"/> + <module name="TypecastParenPad"/> + <module name="RedundantImport"/> + <module name="RedundantModifier"> + <property name="severity" value="warning" /> + </module> + <module name="RightCurly"> + <property name="option" value="same"/> + </module> + <module name="SimplifyBooleanExpression"/> + <module name="SimplifyBooleanReturn"/> + <module name="StaticVariableName"> + <property name="format" value="^[a-z][a-zA-Z0-9]*$"/> + </module> + <module name="TypeName"/> + <module name="UnusedImports"/> + <module name="UpperEll"/> + <module name="VisibilityModifier"> + <property name="protectedAllowed" value="true"/> + </module> + <module name="WhitespaceAfter"> + <property name="tokens" value="COMMA, SEMI"/> + </module> + <module name="WhitespaceAround"/> + <module name="GenericWhitespace"/> + <module name="FinalClass"/> + <module name="MissingSwitchDefault"/> + <module name="MagicNumber"> + <property name="severity" value="warning" /> + <property name="ignoreNumbers" value="-1,0,1, 1"/> + </module> + <module name="Indentation"> + <property name="severity" value="warning" /> + <property name="basicOffset" value="4"/> + <property name="braceAdjustment" value="0"/> + <property name="caseIndent" value="0"/> + </module> + <module name="ArrayTrailingComma"/> +  + <module name="EqualsAvoidNull"/> +  + <module name="CyclomaticComplexity"> + <property name="severity" value="ignore"/> + </module> -  -  - <module name="ModifierOrder"/> -  - - -  -  - <module name="AvoidNestedBlocks"/> - <module name="EmptyBlock"/> - <module name="LeftCurly"/> - <module name="NeedBraces"/> - <module name="RightCurly"/> - - -  -  - <module name="AvoidInlineConditionals"/> - <module name="DoubleCheckedLocking"/>  - <module name="EmptyStatement"/> - <module name="EqualsHashCode"/> - <module name="HiddenField"> - <property name="ignoreConstructorParameter" value="true"/> - <property name="ignoreSetter" value="true"/> - </module> - <module name="IllegalInstantiation"/> - <module name="InnerAssignment"/> - <module name="MagicNumber"> - <property name="ignoreNumbers" value="-60,-30,-5,-1,0,1,2,5,24,30,60,1000"/> - <property name="severity" value="warning"/> - </module> - <module name="MissingSwitchDefault"/> - <module name="RedundantThrows"/> - <module name="SimplifyBooleanExpression"/> - <module name="SimplifyBooleanReturn"/> - -  -  -  - <module name="FinalClass"/> - <module name="HideUtilityClassConstructor"/> - <module name="InterfaceIsType"/> -  - <module name="VisibilityModifier"> - <property name="protectedAllowed" value="true"/> - </module> - - -  -  - <module name="ArrayTypeStyle"/> -  - - <module name="GenericIllegalRegexp"> - <property name="format" value="\s+$"/> - <property name="message" value="Line has trailing spaces."/> - <property name="ignoreComments" value="true"/> - </module> - <module name="TodoComment"/> - <module name="UpperEll"/> - + <module name="NestedIfDepth"> + <property name="max" value="3"/> </module> - + <module name="NestedTryDepth"/> + <module name="ExplicitInitialization"/> + <module name="AnnotationUseStyle"/> + <module name="MissingDeprecated"/> + <module name="MissingOverride"> + <property name="javaFiveCompatibility" value="true"/> + </module> + <module name="PackageAnnotation"/> + <module name="SuppressWarnings"/> + </module> </module> \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/pom.xml 2009-10-15 09:29:00 UTC (rev 2677) @@ -211,13 +211,14 @@ <reporting> <plugins> - <plugin> +  <plugin> <artifactId>maven-project-info-reports-plugin</artifactId>  @@ -243,6 +244,7 @@ </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> + <version>2.5</version> <configuration> <links> <link>http://java.sun.com/javase/6/docs/api/</link> @@ -463,10 +465,6 @@ <id>nuiton.release</id> <url>http://maven.nuiton.org/release</url> </repository> -  </repositories> <pluginRepositories> @@ -474,9 +472,9 @@ <id>nuiton.release</id> <url>http://maven.nuiton.org/release</url> </pluginRepository> -  +  </pluginRepositories> </project> Modified: trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java 2009-10-15 09:29:00 UTC (rev 2677) @@ -229,7 +229,7 @@ MERGE_INVALID_TYPES_VIOLATION); } } - + // mais pas une combinaison des deux } } Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2009-10-15 09:29:00 UTC (rev 2677) @@ -41,20 +41,20 @@ REACH_DAILY_TIME, REACH_TOTAL_TIME } - + /** Alert type. */ protected Type type; - + /** Alert duration. (in seconds) */ protected long duration; - + /** * Constructor. */ public TimerAlert() { } - + /** * Constructor. * Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2009-10-15 09:08:47 UTC (rev 2676) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2009-10-15 09:29:00 UTC (rev 2677) @@ -64,7 +64,7 @@ * More convenient */ protected TimerTask parent; - + /** * Map calendar of day -> time. * (ordered on keys) @@ -80,7 +80,7 @@ * Sub tasks. */ protected List<TimerTask> subTasks; - + /** * Task alerts. */ @@ -95,7 +95,7 @@ allDaysAnnotations = new TreeMap<Date, String>(); subTasks = new ArrayList<TimerTask>(); alerts = new ArrayList<TimerAlert>(); - + // wrong value to detect bug number = -1; } @@ -199,12 +199,12 @@ * @param parent the parent to set */ protected void setParent(TimerTask parent) { - + // will cause an infinite loop if (parent == this) { throw new IllegalArgumentException("Parent can't be current task"); } - + this.parent = parent; }

1 0

r2676 - in trunk: . src/main/java/org/chorem/jtimer
by echatellier＠users.chorem.org Oct. 15, 2009

Oct. 15, 2009

Author: echatellier Date: 2009-10-15 11:08:47 +0200 (Thu, 15 Oct 2009) New Revision: 2676 Modified: trunk/changelog.txt trunk/src/main/java/org/chorem/jtimer/JTimer.java Log: Force task selection on rigth clic Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2009-10-09 14:24:11 UTC (rev 2675) +++ trunk/changelog.txt 2009-10-15 09:08:47 UTC (rev 2676) @@ -3,6 +3,7 @@ jTimer (1.3.1) stable; urgency=low + * Force task selection on rigth clic * Fix duration edition (task and alerts) * Fix NPE related to non available systray * JNA version bump : 3.2.3 Modified: trunk/src/main/java/org/chorem/jtimer/JTimer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimer.java 2009-10-09 14:24:11 UTC (rev 2675) +++ trunk/src/main/java/org/chorem/jtimer/JTimer.java 2009-10-15 09:08:47 UTC (rev 2676) @@ -44,6 +44,7 @@ import javax.swing.ListSelectionModel; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.TreePath; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -1256,6 +1257,11 @@ // gestion du clic droit case MouseEvent.BUTTON3: + // force task selection on rigth clic + TreePath path = projectsAndTasksTable.getPathForLocation(e.getX(), e.getY()); + int selectedRow = projectsAndTasksTable.getRowForPath(path); + projectsAndTasksTable.getSelectionModel().setSelectionInterval(selectedRow, selectedRow); + // fix item selection JPopupMenu menu = new JPopupMenu();

1 0

r2675 - trunk/src/main/assembly
by echatellier＠users.chorem.org Oct. 9, 2009

Oct. 9, 2009

Author: echatellier Date: 2009-10-09 16:24:11 +0200 (Fri, 09 Oct 2009) New Revision: 2675 Modified: trunk/src/main/assembly/bin.xml Log: Add icons at bin assembly root. Modified: trunk/src/main/assembly/bin.xml =================================================================== --- trunk/src/main/assembly/bin.xml 2009-10-09 08:30:54 UTC (rev 2674) +++ trunk/src/main/assembly/bin.xml 2009-10-09 14:24:11 UTC (rev 2675) @@ -17,13 +17,17 @@ </dependencySets> <files> <file> - <source>target/${project.build.finalName}.${project.packaging}</source> - <destName>${artifactId}.${project.packaging}</destName> + <source>target/${project.build.finalName}.jar</source> + <destName>jtimer.jar</destName> </file> <file> - <source>src/main/assembly/${artifact.artifactId}.exe</source> + <source>src/main/resources/org/chorem/jtimer/resources/jtimer-40-orange.png</source> + <destName>jtimer.png</destName> </file> <file> + <source>src/main/assembly/jtimer.exe</source> + </file> + <file> <source>src/main/assembly/jtimer</source> <fileMode>0755</fileMode> </file>

1 0