Author: tchemit Date: 2010-11-21 19:12:47 +0100 (Sun, 21 Nov 2010) New Revision: 2760 Url: http://chorem.org/repositories/revision/jtimer/2760 Log: reformat poms use new m-license-p mecanism to update headers update all files headers optimize dependencies fix a lot of basic codes convention add the dependency invocation in build (I don't want to use IDE to start application) Make project ready for next release (if any...) Modified: trunk/pom.xml trunk/src/license/THIRD-PARTY.properties trunk/src/main/assembly/bin.xml trunk/src/main/assembly/src.xml trunk/src/main/config/checkstyle.xml trunk/src/main/java/org/chorem/jtimer/JTimer.java trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java trunk/src/main/java/org/chorem/jtimer/data/DataViolationException.java trunk/src/main/java/org/chorem/jtimer/data/TimerCore.java trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java trunk/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java trunk/src/main/java/org/chorem/jtimer/data/package-info.java trunk/src/main/java/org/chorem/jtimer/entities/ConnectionData.java trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java trunk/src/main/java/org/chorem/jtimer/entities/TimerProject.java trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java trunk/src/main/java/org/chorem/jtimer/entities/package-info.java trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java trunk/src/main/java/org/chorem/jtimer/io/DataLockingException.java trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java trunk/src/main/java/org/chorem/jtimer/io/GTimerTimeUtil.java trunk/src/main/java/org/chorem/jtimer/io/Saver.java trunk/src/main/java/org/chorem/jtimer/io/package-info.java trunk/src/main/java/org/chorem/jtimer/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java trunk/src/main/java/org/chorem/jtimer/ui/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportTemplateLoader.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java trunk/src/main/java/org/chorem/jtimer/ui/report/package-info.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/java/org/chorem/jtimer/ui/system/SystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java trunk/src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/system/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java trunk/src/main/java/org/chorem/jtimer/ui/system/unix/X11.java trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java trunk/src/main/java/org/chorem/jtimer/ui/system/unix/package-info.java 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 trunk/src/main/java/org/chorem/jtimer/ui/system/win32/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java trunk/src/main/java/org/chorem/jtimer/ui/systray/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java trunk/src/main/java/org/chorem/jtimer/ui/tasks/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/treetable/package-info.java trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java trunk/src/main/java/org/chorem/jtimer/ui/ws/SwingConnectionInformationHandler.java trunk/src/main/java/org/chorem/jtimer/ui/ws/package-info.java trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java trunk/src/main/java/org/chorem/jtimer/utils/package-info.java trunk/src/main/java/org/chorem/jtimer/ws/ConnectionDataHandler.java trunk/src/main/java/org/chorem/jtimer/ws/ProjectManagement.java trunk/src/main/java/org/chorem/jtimer/ws/exception/WebServiceException.java trunk/src/main/java/org/chorem/jtimer/ws/exception/package-info.java trunk/src/main/java/org/chorem/jtimer/ws/package-info.java trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/AbstractXMLRPCClient.java trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/package-info.java trunk/src/main/resources/JTimer.properties trunk/src/main/resources/JTimer_default.properties trunk/src/main/resources/log4j.properties trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor_fr.properties 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 trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager.properties trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties trunk/src/site/en/rst/configuration.rst trunk/src/site/en/rst/contribute/i18n.rst trunk/src/site/en/rst/devel/fileformat.rst trunk/src/site/en/rst/devel/index.rst trunk/src/site/en/rst/devel/roadmap.rst trunk/src/site/en/rst/devel/saf.rst trunk/src/site/en/rst/index.rst trunk/src/site/en/rst/screenshots.rst trunk/src/site/rst/configuration.rst trunk/src/site/rst/contribute/i18n.rst trunk/src/site/rst/devel/fileformat.rst trunk/src/site/rst/devel/index.rst trunk/src/site/rst/devel/roadmap.rst trunk/src/site/rst/devel/saf.rst trunk/src/site/rst/index.rst trunk/src/site/rst/screenshots.rst trunk/src/site/site_en.xml trunk/src/site/site_fr.xml trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java trunk/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java trunk/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java trunk/src/test/java/org/chorem/jtimer/io/AbstractSaverTest.java trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java trunk/src/test/java/org/chorem/jtimer/ui/report/ReportUtilsTest.java trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java trunk/src/test/java/org/chorem/jtimer/ui/widget/DurationEditorTest.java trunk/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java trunk/src/test/resources/JTimerTestRelatif.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/pom.xml 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,379 +1,404 @@ <?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> +<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> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.4.1</version> + </parent> + + <groupId>org.chorem</groupId> + <artifactId>jtimer</artifactId> + <version>1.3.3-SNAPSHOT</version> + + <name>jTimer</name> + <description> + jTimer - Project time tracking and report generation tool. + </description> + <url>http://maven-site.chorem.org/jtimer</url> + <inceptionYear>2007</inceptionYear> + + <licenses> + <license> + <name>General Public License (GPL)</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> + + <developers> + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier@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> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit@codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> + + <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> + + <properties> + + <!-- redmine platform --> + <platform>chorem.org</platform> + + <!--Main class in JAR --> + <maven.jar.main.class>org.chorem.jtimer.JTimer</maven.jar.main.class> + + <!-- license to use --> + <license.licenseName>gpl_v3</license.licenseName> + + <!--Multilanguage maven-site --> + <locales>fr,en</locales> + + <xmrpcVersion>3.1.3</xmrpcVersion> - <groupId>org.chorem</groupId> - <artifactId>jtimer</artifactId> - <version>1.3.3-SNAPSHOT</version> - <packaging>jar</packaging> + <!-- files to deploy to redmine --> + <redmine.releaseFiles> + target/${project.artifactId}-${project.version}-bin.zip, + target/${project.artifactId}-${project.version}-src.zip, + </redmine.releaseFiles> - <name>jTimer</name> - <description>jTimer - Project time tracking and report generation tool.</description> - <url>http://maven-site.chorem.org/jtimer</url> - <inceptionYear>2007</inceptionYear> + </properties> - <licenses> - <license> - <name>General Public License (GPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> + <build> + <resources> + <!-- TODO ce qui doit être filtree devrait etre dans src/main/filters --> + <!-- TODO en plus ce veut pas dire grand chose d'avoir deux fois la meme resource ??? c quoi ce hack ? --> + <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> - <developers> - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier@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@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit@codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-dependencies</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>true</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + <silent>true</silent> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <mainClass>${maven.jar.main.class}</mainClass> + <classpathPrefix>lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </pluginManagement> + </build> - <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> + <reporting> + <plugins> + <plugin> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.5</version> + <configuration> + <configLocation>${maven.src.dir}/main/config/checkstyle.xml + </configLocation> + <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java, + **/ApplicationServices.java + </excludes> + </configuration> + </plugin> - <properties> - - <!-- redmine platform --> - <platform>chorem.org</platform> - - <!--Main class in JAR --> - <maven.jar.main.class>org.chorem.jtimer.JTimer</maven.jar.main.class> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <configuration> + <type>range</type> + <range>365</range> + </configuration> + </plugin> - <!-- license to use --> - <license.licenseName>gpl_v3</license.licenseName> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.4</version> + </plugin> - <!--Multilanguage maven-site --> - <locales>fr,en</locales> + <!-- TODO Use this when jnlp will be ok --> + <!--plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> + </plugin--> + </plugins> + </reporting> - <!-- files to deploy to redmine --> - <redmine.releaseFiles> - target/${project.artifactId}-${project.version}-bin.zip, - target/${project.artifactId}-${project.version}-src.zip, - </redmine.releaseFiles> + <dependencies> + <dependency> + <groupId>org.jdesktop.bsaf</groupId> + <artifactId>bsaf</artifactId> + <version>1.9</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx-core</artifactId> + <version>1.6.2-2</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>net.java.dev.jna</groupId> + <artifactId>jna</artifactId> + <version>3.2.7</version> + <scope>compile</scope> + </dependency> - </properties> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.freemarker</groupId> + <artifactId>freemarker</artifactId> + <version>2.3.16</version> + </dependency> + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>${xmrpcVersion}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-common</artifactId> + <version>${xmrpcVersion}</version> + <scope>compile</scope> + </dependency> - <build> - <resources> - <!-- TODO ce qui doit être filtree devrait etre dans src/main/filters --> - <!-- TODO en plus ce veut pas dire grand chose d'avoir deux fois la meme resource ??? c quoi ce hack ? --> - <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> + <!-- commons-xxx lib --> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <mainClass>${maven.jar.main.class}</mainClass> - <classpathPrefix>lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemProperties> - <!-- TODO on pourrait peut-etre le mettre dans mavenpom pour tout le monde ? --> - <property> - <name>java.io.tmpdir</name> - <value>${project.build.directory}/surefire-workdir</value> - </property> - </systemProperties> - </configuration> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - </build> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <scope>runtime</scope> + </dependency> - <reporting> + <!-- tests dependencies --> + + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.14.2</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> + + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> <plugins> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.5</version> + <plugin> + <groupId>org.bluestemsoftware.open.maven.plugin</groupId> + <artifactId>launch4j-plugin</artifactId> + <version>1.5.0.0</version> + <executions> + <execution> + <id>launch4j</id> + <phase>package</phase> + <goals> + <goal>launch4j</goal> + </goals> <configuration> - <configLocation>${maven.src.dir}/main/config/checkstyle.xml</configLocation> - <excludes>**/Xss.java,**/X11.java,**/Kernel32.java,**/User32.java, **/ApplicationServices.java</excludes> + <dontWrapJar>true</dontWrapJar> + <headerType>gui</headerType> + <outfile>target/jtimer.exe</outfile> + <jar>jtimer.jar</jar> + <errTitle>${project.name}</errTitle> + <jre> + <minVersion>1.6.0</minVersion> + </jre> </configuration> - </plugin> - - <plugin> - <artifactId>maven-changelog-plugin</artifactId> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>assembly-bin</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> <configuration> - <type>range</type> - <range>365</range> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + <descriptor>src/main/assembly/src.xml</descriptor> + </descriptors> + <attach>false</attach> </configuration> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.4</version> - </plugin> - - <!-- TODO Use this when jnlp will be ok --> - <!--plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20091001</version> - </plugin--> + </execution> + </executions> + </plugin> + <!-- FIXME : utiliser le profile de mavenpom --> + <!--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>${exec.mainClass}</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> - </reporting> + </build> + </profile> + </profiles> - <dependencies> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.14.2</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jdesktop.bsaf</groupId> - <artifactId>bsaf</artifactId> - <version>1.9</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swingx-core</artifactId> - <version>1.6.2-2</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>net.java.dev.jna</groupId> - <artifactId>jna</artifactId> - <version>3.2.7</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.5</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>2.0</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.16</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.freemarker</groupId> - <artifactId>freemarker</artifactId> - <version>2.3.16</version> - </dependency> - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>3.1.3</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <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> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.bluestemsoftware.open.maven.plugin</groupId> - <artifactId>launch4j-plugin</artifactId> - <version>1.5.0.0</version> - <executions> - <execution> - <id>launch4j</id> - <phase>package</phase> - <goals> - <goal>launch4j</goal> - </goals> - <configuration> - <dontWrapJar>true</dontWrapJar> - <headerType>gui</headerType> - <outfile>target/jtimer.exe</outfile> - <jar>jtimer.jar</jar> - <errTitle>${project.name}</errTitle> - <jre> - <minVersion>1.6.0</minVersion> - </jre> - </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> - <!-- FIXME : utiliser le profile de mavenpom --> - <!--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>${exec.mainClass}</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> + <pluginRepositories> + <pluginRepository> + <id>nuiton.release</id> + <url>http://maven.nuiton.org/release</url> + </pluginRepository> + </pluginRepositories> </project> Modified: trunk/src/license/THIRD-PARTY.properties =================================================================== --- trunk/src/license/THIRD-PARTY.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/license/THIRD-PARTY.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -2,17 +2,20 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache License +# - Apache Software License, Version 2.0 # - BSD License # - BSD-style license +# - Common Public License Version 1.0 +# - GNU LESSER GENERAL PUBLIC LICENSE +# - LGPL 2.1 +# - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) +# - Public Domain # - The Apache Software License, Version 2.0 -# - cpl-1.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Jul 22 11:01:24 CEST 2010 -commons-codec--commons-codec--1.2=Apache Software License, Version 2.0 -net.java.dev.jna--jna--3.2.7=Lesser General Public License (LGPL v. 2.1) -org.jdesktop--appframework--1.0.3=Lesser General Public License (LGPL v. 2.1) -org.jdesktop--swing-worker--1.1=Lesser General Public License (LGPL v. 2.1) +#Sun Nov 21 18:20:11 CET 2010 +commons-codec--commons-codec--1.2--jar=Apache Software License, Version 2.0 +net.java.dev.jna--jna--3.2.7--jar=Lesser General Public License (LGPL v. 2.1) Modified: trunk/src/main/assembly/bin.xml =================================================================== --- trunk/src/main/assembly/bin.xml 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/assembly/bin.xml 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + jTimer + + $Id$ + $HeadURL$ + %% + Copyright (C) 2007 - 2010 CodeLutin + %% + 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 3 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, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <assembly 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/assembly-1.1.1.xsd"> <id>bin</id> Modified: trunk/src/main/assembly/src.xml =================================================================== --- trunk/src/main/assembly/src.xml 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/assembly/src.xml 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + jTimer + + $Id$ + $HeadURL$ + %% + Copyright (C) 2007 - 2010 CodeLutin + %% + 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 3 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, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <assembly 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/assembly-1.1.1.xsd"> <id>src</id> Modified: trunk/src/main/config/checkstyle.xml =================================================================== --- trunk/src/main/config/checkstyle.xml 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/config/checkstyle.xml 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,4 +1,29 @@ <?xml version="1.0"?> +<!-- + #%L + jTimer + + $Id$ + $HeadURL$ + %% + Copyright (C) 2007 - 2010 CodeLutin + %% + 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 3 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, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd"> Modified: trunk/src/main/java/org/chorem/jtimer/JTimer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimer.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/JTimer.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer; @@ -69,6 +76,7 @@ import org.chorem.jtimer.ws.ConnectionDataHandler; import org.chorem.jtimer.ws.ProjectManagement; import org.jdesktop.application.Action; +import org.jdesktop.application.Application; import org.jdesktop.application.ApplicationContext; import org.jdesktop.application.ResourceMap; import org.jdesktop.application.SingleFrameApplication; @@ -105,28 +113,28 @@ protected ResourceMap resourceMap; /** Single project selection property. */ - protected boolean selectedSingleProject = false; + protected boolean selectedSingleProject ; /** Single task selection property. */ - protected boolean selectedSingleTask = false; + protected boolean selectedSingleTask; /** Single task or project selection. */ - protected boolean selectedSingleElement = false; + protected boolean selectedSingleElement; /** Single running task selection. */ - protected boolean selectedSingleRunningTask = false; + protected boolean selectedSingleRunningTask; /** Single non running task selection. */ - protected boolean selectedSingleStoppedTask = false; + protected boolean selectedSingleStoppedTask; /** Multiples projects selection. */ - protected boolean selectedMultiplesProjects = false; + protected boolean selectedMultiplesProjects; /** Multiples tasks selection. */ - protected boolean selectedMultiplesTasks = false; + protected boolean selectedMultiplesTasks; /** Multiples elements selection. */ - protected boolean selectedMultiplesElements = false; + protected boolean selectedMultiplesElements; /** * Main. launch UI @@ -146,7 +154,7 @@ * Initialize application. Called before UI build. * * @param args args - * @see org.jdesktop.application.Application#initialize(String[]) + * @see Application#initialize(String[]) */ @Override protected void initialize(String[] args) { @@ -155,7 +163,7 @@ super.initialize(args); // init resources map - ApplicationContext ctxt = this.getContext(); + ApplicationContext ctxt = getContext(); resourceMap = ctxt.getResourceMap(); // init timercore @@ -182,7 +190,7 @@ * * Create frame menu bar. Create main component. * - * @see org.jdesktop.application.Application#startup() + * @see Application#startup() */ @Override protected void startup() { @@ -369,7 +377,7 @@ /** * Ready. Called when UI is ready and displayed. * - * @see org.jdesktop.application.Application#ready() + * @see Application#ready() */ @Override protected void ready() { @@ -386,7 +394,7 @@ } else { String failTitle = resourceMap.getString("startFail.title"); String failMessage = resourceMap.getString("startFail.message"); - JOptionPane.showMessageDialog(this.getMainFrame(), failMessage, + JOptionPane.showMessageDialog(getMainFrame(), failMessage, failTitle, JOptionPane.ERROR_MESSAGE); exit(); } @@ -397,7 +405,7 @@ * * Save context. * - * @see org.jdesktop.application.SingleFrameApplication#shutdown() + * @see SingleFrameApplication#shutdown() */ @Override protected void shutdown() { @@ -494,8 +502,7 @@ TimerProject project = projectsAndTasksTable.getSelectedProjects().get( 0); - String newProjectName = (String) JOptionPane.showInputDialog(this - .getMainFrame(), resourceMap + String newProjectName = (String) JOptionPane.showInputDialog(getMainFrame(), resourceMap .getString("input.editProjectMessage"), resourceMap .getString("input.editProjectTitle"), JOptionPane.INFORMATION_MESSAGE, null, null, project.getName()); @@ -571,7 +578,7 @@ * If it not already been running * * @return TimerTask scheduled for start - * @see org.jdesktop.application.Task + * @see Task */ @Action(enabledProperty = "selectedSingleStoppedTask") public Task<?, ?> startTask() { @@ -605,7 +612,7 @@ protected RunTaskJob getJobForRunningTask(TimerTask task) { RunTaskJob job = null; - TaskMonitor tm = this.getContext().getTaskMonitor(); + TaskMonitor tm = getContext().getTaskMonitor(); for (Task<Void, Long> t : tm.getTasks()) { TimerTask localtask = ((RunTaskJob) t).getTask(); if (task.equals(localtask)) { @@ -655,7 +662,7 @@ */ public void stopAllTasks() { - TaskMonitor tm = this.getContext().getTaskMonitor(); + TaskMonitor tm = getContext().getTaskMonitor(); for (Task<Void, Long> t : tm.getTasks()) { // task TimerTask ttask = ((RunTaskJob) t).getTask(); @@ -693,7 +700,7 @@ 0); if (project != null) { - int confirm = JOptionPane.showConfirmDialog(this.getMainFrame(), + int confirm = JOptionPane.showConfirmDialog(getMainFrame(), resourceMap.getString("input.deleteProjectMessage", project .getName()), resourceMap .getString("input.deleteProjectTitle"), @@ -720,7 +727,7 @@ TimerTask task = projectsAndTasksTable.getSelectedTasks().get(0); if (task != null) { - int confirm = JOptionPane.showConfirmDialog(this.getMainFrame(), + int confirm = JOptionPane.showConfirmDialog(getMainFrame(), resourceMap.getString("input.deleteTaskMessage", task .getName()), resourceMap .getString("input.deleteTaskTitle"), @@ -852,7 +859,7 @@ TimerTask destinationTask = tasks.get(0); List<TimerTask> otherTasks = tasks.subList(1, tasks.size()); - int confirm = JOptionPane.showConfirmDialog(this.getMainFrame(), + int confirm = JOptionPane.showConfirmDialog(getMainFrame(), resourceMap.getString("input.mergeTaskMessage", tasks.size(), destinationTask.getName()), resourceMap .getString("input.mergeTaskTitle"), @@ -904,7 +911,7 @@ TimerTask selectedTask = projectsAndTasksTable.getSelectedTasks() .get(0); - AlertEditor alertEditor = new AlertEditor(this, this.core.getData(), + AlertEditor alertEditor = new AlertEditor(this, core.getData(), selectedTask); show(alertEditor); } @@ -1149,7 +1156,7 @@ * @return swing action */ protected javax.swing.Action getAction(String actionName) { - return this.getContext().getActionMap().get(actionName); + return getContext().getActionMap().get(actionName); } /** @@ -1158,8 +1165,8 @@ @Action public void show() { // TODO better code ? that use SAF methods ? - super.getMainFrame().setVisible(true); - super.getMainFrame().toFront(); + getMainFrame().setVisible(true); + getMainFrame().toFront(); } /** @@ -1168,7 +1175,7 @@ @Action public void hide() { // TODO better code ? that use SAF methods ? - super.getMainFrame().setVisible(false); + getMainFrame().setVisible(false); } /** @@ -1212,7 +1219,7 @@ // first, on dlb click stop all running tasks stopAllTasks(); - this.getContext().getTaskService().execute(appTask); + getContext().getTaskService().execute(appTask); } /* TODO EC-20100416 temp disable, called twice, can display -1 task running :( Modified: trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/JTimerFactory.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer; Modified: trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/data/CommonVetoable.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.data; @@ -89,7 +96,7 @@ return found; } - /** + /* * {@inheritDoc} */ @Override @@ -105,7 +112,7 @@ } } - /** + /* * {@inheritDoc} */ @Override @@ -121,7 +128,7 @@ } } - /** + /* * {@inheritDoc} */ @Override @@ -129,7 +136,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -137,7 +144,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -145,7 +152,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -161,7 +168,7 @@ } } - /** + /* * {@inheritDoc} */ @Override @@ -178,7 +185,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -216,7 +223,7 @@ } } - /** + /* * {@inheritDoc} */ @Override @@ -224,7 +231,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -232,7 +239,7 @@ } - /** + /* * {@inheritDoc} */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/data/DataEventListener.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.data; @@ -41,28 +48,28 @@ * * @param project project to add */ - public void addProject(TimerProject project); + void addProject(TimerProject project); /** * Add task event. * * @param task task to add */ - public void addTask(TimerTask task); + void addTask(TimerTask task); /** * Modify project. * * @param project modified project */ - public void modifyProject(TimerProject project); + void modifyProject(TimerProject project); /** * Modify task. * * @param task modified task */ - public void modifyTask(TimerTask task); + void modifyTask(TimerTask task); /** * Before delete project. @@ -71,7 +78,7 @@ * * @param project deleted project */ - public void preDeleteProject(TimerProject project); + void preDeleteProject(TimerProject project); /** * Before delete task. @@ -80,21 +87,21 @@ * * @param task deleted task */ - public void preDeleteTask(TimerTask task); + void preDeleteTask(TimerTask task); /** * Delete project. * * @param project deleted project */ - public void deleteProject(TimerProject project); + void deleteProject(TimerProject project); /** * Delete task. * * @param task deleted task */ - public void deleteTask(TimerTask task); + void deleteTask(TimerTask task); /** * Add annotation. @@ -103,7 +110,7 @@ * @param date date * @param annotation new annotation value */ - public void setAnnotation(TimerTask task, Date date, String annotation); + void setAnnotation(TimerTask task, Date date, String annotation); /** * Set task time. @@ -112,35 +119,35 @@ * @param date date * @param time task time */ - public void setTaskTime(TimerTask task, Date date, Long time); + void setTaskTime(TimerTask task, Date date, Long time); /** * Pre change task state. * * @param task task */ - public void preChangeClosedState(TimerTask task); + void preChangeClosedState(TimerTask task); /** * Post change task state. * * @param task task */ - public void postChangeClosedState(TimerTask task); + void postChangeClosedState(TimerTask task); /** * Pre move task. * * @param task task */ - public void preMoveTask(TimerTask task); + void preMoveTask(TimerTask task); /** * Post move task. * * @param task task */ - public void moveTask(TimerTask task); + void moveTask(TimerTask task); /** * Pre merge task. @@ -148,7 +155,7 @@ * @param destinationTask task where all other task will be merged * @param otherTasks other tasks to merge */ - public void preMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); + void preMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); /** * Post merge task. @@ -156,26 +163,26 @@ * @param destinationTask task where all other task will be merged * @param otherTasks other tasks to merge */ - public void postMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); + void postMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); /** * Start task. * * @param task started task */ - public void startTask(TimerTask task); + void startTask(TimerTask task); /** * Stop task. * * @param task stoped task */ - public void stopTask(TimerTask task); + void stopTask(TimerTask task); /** * All data loaded. * * @param projects projects collection */ - public void dataLoaded(Collection<TimerProject> projects); + void dataLoaded(Collection<TimerProject> projects); } Modified: trunk/src/main/java/org/chorem/jtimer/data/DataViolationException.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/DataViolationException.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/data/DataViolationException.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.data; Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerCore.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/TimerCore.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerCore.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.data; @@ -57,7 +64,7 @@ protected WSDaemon webServiceDaemon; /** connection data handler */ - protected ConnectionDataHandler connectionHandler = null; + protected ConnectionDataHandler connectionHandler; /** * Constructor. Modified: trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/data/TimerDataManager.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.data; @@ -116,19 +123,15 @@ public synchronized void addProject(TimerProject project) { // fire vetoable event - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkAddProject(project); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkAddProject(project); } projectList.add(project); // fire data event - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().addProject(project); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.addProject(project); } } @@ -141,19 +144,15 @@ public synchronized void addTask(TimerTask parent, TimerTask task) { // fire vetoable event - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkAddTask(parent, task); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkAddTask(parent, task); } parent.addTask(task); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().addTask(task); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.addTask(task); } } @@ -168,10 +167,8 @@ projectList.addAll(projects); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().dataLoaded(projects); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.dataLoaded(projects); } } } @@ -198,19 +195,15 @@ long value) { // fire vetoable event - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkSetTaskTime(task, date, value); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkSetTaskTime(task, date, value); } task.setTime(date, Long.valueOf(value)); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().setTaskTime(task, date, value); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.setTaskTime(task, date, value); } } @@ -221,10 +214,8 @@ */ public synchronized void startTask(TimerTask task) { // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().startTask(task); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.startTask(task); } } @@ -235,10 +226,8 @@ */ public synchronized void stopTask(TimerTask task) { // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().stopTask(task); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.stopTask(task); } } @@ -250,10 +239,8 @@ public synchronized void deleteTask(TimerTask task) { // fire vetoable event - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkDeleteTask(task); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkDeleteTask(task); } // send notification (before) @@ -282,10 +269,8 @@ public synchronized void deleteProject(TimerProject project) { // fire vetoable event - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkDeleteProject(project); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkDeleteProject(project); } // send notification (before) @@ -346,10 +331,8 @@ public synchronized void changeTaskCloseState(TimerTask task) { // fire vetoable event - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkChangeClosedState(task); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkChangeClosedState(task); } // send notification @@ -380,19 +363,15 @@ // fire vetoable event TimerProject newProject = project.clone(); newProject.setName(newProjectName); - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkModifyProject(newProject); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkModifyProject(newProject); } project.setName(newProjectName); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().modifyProject(project); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.modifyProject(project); } } @@ -407,19 +386,15 @@ // fire vetoable event TimerTask newTask = task.clone(); newTask.setName(newTaskName); - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkChangeClosedState(newTask); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkChangeClosedState(newTask); } task.setName(newTaskName); // send notification - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().modifyTask(task); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.modifyTask(task); } } @@ -432,10 +407,8 @@ public synchronized void moveTask(TimerTask destination, Collection<TimerTask> tasksToMove) { // fire vetoable event - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkMoveTask(destination, tasksToMove); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkMoveTask(destination, tasksToMove); } for (TimerTask taskToMove : tasksToMove) { @@ -469,10 +442,8 @@ public synchronized void mergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks) { // fire vetoable event - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkMergeTasks(destinationTask, otherTasks); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkMergeTasks(destinationTask, otherTasks); } // send pre notification @@ -587,20 +558,16 @@ String annotation) { // fire vetoable event - Iterator<VetoableDataEventListener> itVetoableDataEventListener = vetoableDataEventListeners - .iterator(); - while (itVetoableDataEventListener.hasNext()) { - itVetoableDataEventListener.next().checkSetAnnotation(task, date, - annotation); + for (VetoableDataEventListener vetoableDataEventListener : vetoableDataEventListeners) { + vetoableDataEventListener.checkSetAnnotation(task, date, + annotation); } task.addAnnotation(date, annotation); // send event - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().setAnnotation(task, date, annotation); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.setAnnotation(task, date, annotation); } } @@ -612,10 +579,8 @@ public synchronized void modifyAlert(TimerTask task) { // send event - Iterator<DataEventListener> itDataEventListener = dataEventListeners - .iterator(); - while (itDataEventListener.hasNext()) { - itDataEventListener.next().modifyTask(task); + for (DataEventListener dataEventListener : dataEventListeners) { + dataEventListener.modifyTask(task); } } Modified: trunk/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/data/VetoableDataEventListener.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.data; @@ -41,7 +48,7 @@ * * @param project project to add */ - public void checkAddProject(TimerProject project); + void checkAddProject(TimerProject project); /** * Check add task. @@ -49,35 +56,35 @@ * @param parent parent task * @param task task to add */ - public void checkAddTask(TimerTask parent, TimerTask task); + void checkAddTask(TimerTask parent, TimerTask task); /** * Check modify project. * * @param project modified project */ - public void checkModifyProject(TimerProject project); + void checkModifyProject(TimerProject project); /** * Check modify task. * * @param task modified task */ - public void checkModifyTask(TimerTask task); + void checkModifyTask(TimerTask task); /** * Check delete project. * * @param project deleted project */ - public void checkDeleteProject(TimerProject project); + void checkDeleteProject(TimerProject project); /** * Check delete task. * * @param task deleted task */ - public void checkDeleteTask(TimerTask task); + void checkDeleteTask(TimerTask task); /** * Check update task annotation. @@ -86,7 +93,7 @@ * @param date day of change * @param value new annotation */ - public void checkSetAnnotation(TimerTask task, Date date, String value); + void checkSetAnnotation(TimerTask task, Date date, String value); /** * Check update task time. @@ -95,14 +102,14 @@ * @param date day of change * @param value new time in seconds */ - public void checkSetTaskTime(TimerTask task, Date date, Long value); + void checkSetTaskTime(TimerTask task, Date date, Long value); /** * Check change task state. * * @param task task */ - public void checkChangeClosedState(TimerTask task); + void checkChangeClosedState(TimerTask task); /** * Check move task. @@ -110,7 +117,7 @@ * @param destination task to move to * @param tasksToMove tasks to move */ - public void checkMoveTask(TimerTask destination, Collection<TimerTask> tasksToMove); + void checkMoveTask(TimerTask destination, Collection<TimerTask> tasksToMove); /** * Check merge task. @@ -118,6 +125,6 @@ * @param destinationTask task result of merge * @param otherTasks other task to merge */ - public void checkMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); + void checkMergeTasks(TimerTask destinationTask, List<TimerTask> otherTasks); } Modified: trunk/src/main/java/org/chorem/jtimer/data/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/data/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/data/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Data management classes. */ Modified: trunk/src/main/java/org/chorem/jtimer/entities/ConnectionData.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/ConnectionData.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/entities/ConnectionData.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.entities; @@ -52,6 +59,6 @@ * @param newLogin the login to set */ public void setLogin(String newLogin) { - this.login = newLogin; + login = newLogin; } } Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerAlert.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.entities; @@ -37,7 +44,7 @@ /** * Alert type. */ - public static enum Type { + public enum Type { REACH_DAILY_TIME, REACH_TOTAL_TIME } @@ -108,7 +115,7 @@ */ @Override public TimerAlert clone() { - TimerAlert clone = null; + TimerAlert clone; try { clone = (TimerAlert)super.clone(); } catch (CloneNotSupportedException e) { Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerProject.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerProject.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerProject.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.entities; @@ -39,7 +46,6 @@ * Constructor. */ public TimerProject() { - super(); } /** Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTask.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.entities; @@ -201,7 +208,7 @@ protected void setParent(TimerTask parent) { // will cause an infinite loop - if (parent == this) { + if (equals(parent)) { throw new IllegalArgumentException("Parent can't be current task"); } @@ -257,7 +264,7 @@ Long t = allDaysAndTimes.get(date); if (t != null) { - result = t.longValue(); + result = t; } return result; @@ -361,7 +368,7 @@ // name equals boolean equals = name != null && name.equals(otherTask.name); // creation date equals - equals &= this.creationDate == null + equals &= creationDate == null || creationDate.equals(otherTask.creationDate); // subtask equals equals &= subTasks.equals(otherTask.subTasks); @@ -381,7 +388,7 @@ @Override public TimerTask clone() { - TimerTask task = null; + TimerTask task; try { task = (TimerTask) super.clone(); @@ -422,13 +429,13 @@ int result; - if (this.getName() == null) { + if (getName() == null) { result = -1; } else if (o.getName() == null) { result = 1; } else { // sort on name - result = this.getName().compareTo(o.getName()); + result = getName().compareTo(o.getName()); } return result; Modified: trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/entities/TimerTaskHelper.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.entities; @@ -54,6 +61,7 @@ * @return the subTasks ordered * @deprecated Remove when tree ordering is implemented */ + @Deprecated public static List<TimerTask> getSubTasksOrderedByName(TimerTask task) { List<TimerTask> taksToSort = task.getSubTasks(); List<TimerTask> subTasksCopy = new ArrayList<TimerTask>(taksToSort); @@ -86,7 +94,7 @@ long totalTime = 0L; for (Long t : task.getAllDaysAndTimes().values()) { - totalTime += t.longValue(); + totalTime += t; } return totalTime; @@ -103,7 +111,7 @@ long totalTime = 0L; for (Long t : task.getAllDaysAndTimes().values()) { - totalTime += t.longValue(); + totalTime += t; } // add allday subtask time @@ -122,7 +130,7 @@ * @return time in seconds */ public static long getTotalTime(TimerTask task, Date date) { - long result = 0L; + long result; // only task time result = task.getTime(date); @@ -305,7 +313,7 @@ boolean present = false; for (TimerTask oneTask : tasks) { - if (task == oneTask) { + if (oneTask.equals(task)) { present = true; } Modified: trunk/src/main/java/org/chorem/jtimer/entities/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/entities/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/entities/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * jTimer entities. */ Modified: trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/io/AbstractSaver.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.io; @@ -77,6 +84,7 @@ * Rename backup file to original file name; * * @param backupFile backup file + * @return */ protected boolean restoreBackupFile(File backupFile) { Modified: trunk/src/main/java/org/chorem/jtimer/io/DataLockingException.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/DataLockingException.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/io/DataLockingException.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.io; Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerIncrementalSaver.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.io; @@ -240,7 +247,7 @@ lock.release(); // cancel timer - this.cancel(); + cancel(); autoSaveTimer.purge(); autoSaveTimer.cancel(); @@ -627,7 +634,8 @@ alertTaskFile)); // skip first line : "format: 1.2" - String line = alertIn.readLine(); + alertIn.readLine(); + String line; while ((line = alertIn.readLine()) != null) { line = line.trim(); @@ -1189,7 +1197,7 @@ // init -1, ++ start with 0 int foundProjectNumber = -1; - File aGtimerFile = null; + File aGtimerFile; // en esperant que sera pas infini :) do { @@ -1487,7 +1495,7 @@ } } - /** + /* * {@inheritDoc} */ @Override @@ -1495,7 +1503,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -1503,7 +1511,7 @@ checkName(project); } - /** + /* * {@inheritDoc} */ @Override @@ -1530,7 +1538,7 @@ } } - /** + /* * {@inheritDoc} */ @Override @@ -1538,7 +1546,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -1546,7 +1554,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -1554,7 +1562,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -1562,7 +1570,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -1570,7 +1578,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -1578,7 +1586,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -1586,7 +1594,7 @@ } - /** + /* * {@inheritDoc} */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/io/GTimerTimeUtil.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/GTimerTimeUtil.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/io/GTimerTimeUtil.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.io; @@ -60,7 +67,7 @@ public static Date yyyyMMdd2Date(String dateAsString) { int year, mouth, day; - Date date = null; + Date date; try { String syear = dateAsString.substring(0, 4); Modified: trunk/src/main/java/org/chorem/jtimer/io/Saver.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/Saver.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/io/Saver.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.io; @@ -40,34 +47,34 @@ * * @param directory directory */ - public void setSaveDirectory(String directory); + void setSaveDirectory(String directory); /** * Set auto save delay (in milliseconds). * * @param autoSaveDelay delay in milliseconds */ - public void setAutoSaveDelay(long autoSaveDelay); + void setAutoSaveDelay(long autoSaveDelay); /** * Try to lock current saver directory. * * @throws DataLockingException if can't obtain lock */ - public void lock() throws DataLockingException; + void lock() throws DataLockingException; /** * Try to unlock current saver directory. * * @throws DataLockingException if there is no lock */ - public void unlock() throws DataLockingException; + void unlock() throws DataLockingException; /** * Load a project list. * * @return a collection of projects */ - public Collection<TimerProject> load(); + Collection<TimerProject> load(); } Modified: trunk/src/main/java/org/chorem/jtimer/io/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/io/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/io/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Application data savers. */ Modified: trunk/src/main/java/org/chorem/jtimer/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * jTimer. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/HelpFrame.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui; @@ -56,7 +63,7 @@ public class HelpFrame extends FrameView implements HyperlinkListener { /** serialVersionUID */ - private static final long serialVersionUID = -8693584537185015506L; +// private static final long serialVersionUID = -8693584537185015506L; /** log */ private static Log log = LogFactory.getLog(HelpFrame.class); @@ -83,6 +90,7 @@ /** * Get UI main component. + * @return */ protected JComponent getMainComponent() { Modified: trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/StatusBar.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui; @@ -68,7 +75,7 @@ /** * Reference how many tasks are running */ - protected int nbTasksRunning = 0; + protected int nbTasksRunning; /** * Constucteur. @@ -88,13 +95,13 @@ // message label lblMessage = new JLabel(resourceMap.getString("loadingMessage")); lblMessage.setBorder(BorderFactory.createEtchedBorder()); - this.add(lblMessage); + add(lblMessage); // time label lblTime = new JLabel(resourceMap.getString("todayTotalMessage", "--")); lblTime.setBorder(BorderFactory.createEtchedBorder()); lblTime.setHorizontalAlignment(SwingConstants.CENTER); - this.add(lblTime); + add(lblTime); // save tdm this.dataManager = dataManager; @@ -257,7 +264,7 @@ } // display message - String message = null; + String message; if (nbTasksRunning == 0) { message = resourceMap.getString("idleMessage"); } else { Modified: trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/TimerTaskEditor.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,28 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + package org.chorem.jtimer.ui; import java.awt.BorderLayout; @@ -79,41 +87,41 @@ private static Log log = LogFactory.getLog(TimerTaskEditor.class); /** I18n resources map */ - protected ResourceMap resourceMap = null; + protected ResourceMap resourceMap; /** task title */ - protected JTextField titleText = null; + protected JTextField titleText; /** month calendar */ - protected JXMonthView monthView = null; + protected JXMonthView monthView; /** hour spinner */ - protected JSpinner spinnerH = null; + protected JSpinner spinnerH; /** minute spinner */ - protected JSpinner spinnerM = null; + protected JSpinner spinnerM; /** second spinner */ - protected JSpinner spinnerS = null; + protected JSpinner spinnerS; /** annotation textarea */ - protected JTextArea annotationText = null; + protected JTextArea annotationText; /** change listener on spinners */ - protected ChangeListener spinnerListener = null; + protected ChangeListener spinnerListener; /** change listener on annotation textarea */ - protected DocumentListener titleChangeListener = null; + protected DocumentListener titleChangeListener; /** change listener on annotation textarea */ - protected DocumentListener annotationChangeListener = null; + protected DocumentListener annotationChangeListener; /** task to edit */ - protected TimerTask task = null; + protected TimerTask task; /** task to edit */ - protected TimerTask cloneTask = null; + protected TimerTask cloneTask; /** timer core */ - protected TimerCore core = null; + protected TimerCore core; /** task manager */ - protected TimerDataManager dataManager = null; + protected TimerDataManager dataManager; /** did the modified the title ? */ - protected boolean isTitleChanged = false; + protected boolean isTitleChanged; /** did the modified annotation ? */ - protected boolean isAnnotationChanged = false; + protected boolean isAnnotationChanged; /** * days modified: You can modify any number of days before you apply changes, @@ -129,16 +137,16 @@ /** * selected monthview day: should never be null */ - protected Calendar selectedDay = null; + protected Calendar selectedDay; /** * apply button: keep reference in order to be able to call setEnabled(true or false) */ - protected JButton applyButton = null; + protected JButton applyButton; /** * revert button: keep reference in order to be able to call setEnabled(true or false) */ - protected JButton revertButton = null; + protected JButton revertButton; /** * TimerTaskEditor @@ -155,9 +163,9 @@ // UIManager.put("JXMonthView.unselectableDayForeground", Color.GRAY); this.task = task; - this.cloneTask = task.clone(); + cloneTask = task.clone(); this.core = core; - this.dataManager = core.getData(); + dataManager = core.getData(); // init resources map ApplicationContext ctxt = application.getContext(); Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellEditor.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.alert; @@ -90,7 +97,7 @@ case 1: DurationEditor durationEditor = new DurationEditor(9999); - long duration = ((Long)value).longValue(); + long duration = (Long) value; durationEditor.setDuration(duration); durationEditor.addPropertyChangeListener("duration", this); durationEditor.setSize(100, 30); Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertCellRenderer.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.alert; @@ -61,7 +68,7 @@ case 1: DurationEditor durationEditor = new DurationEditor(9999); - long duration = ((Long)value).longValue(); + long duration = (Long) value; durationEditor.setDuration(duration); c = durationEditor; break; @@ -71,7 +78,9 @@ } // restore super properties - c.setBackground(superComponent.getBackground()); + if (c != null) { + c.setBackground(superComponent.getBackground()); + } return c; } Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertEditor.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.alert; @@ -54,7 +61,7 @@ public class AlertEditor extends FrameView implements ListSelectionListener { /** serialVersionUID. */ - private static final long serialVersionUID = 5606265095312928490L; +// private static final long serialVersionUID = 5606265095312928490L; /** Task to manage alert on. */ protected TimerTask task; Modified: trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/alert/AlertTableModel.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.alert; @@ -122,7 +129,7 @@ break; case 1: - long duration = ((Long)value).longValue(); + long duration = (Long) value; alert.setDuration(duration); break; Modified: trunk/src/main/java/org/chorem/jtimer/ui/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * jTimer UI. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportGenerator.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report; Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportTemplateLoader.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportTemplateLoader.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportTemplateLoader.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report; @@ -41,7 +48,7 @@ private static Log log = LogFactory.getLog(ReportTemplateLoader.class); /** base dir for all template */ - protected String basedir = null; + protected String basedir; /** * Constructor. Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportUtils.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report; @@ -132,7 +139,7 @@ * @return duration in seconds */ public long getDailyTaskTime(TimerTask task, Date day) { - long result = 0; + long result; result = task.getTime(day); @@ -265,7 +272,7 @@ * @return duration in seconds */ public long getDailyTotalTaskTime(TimerTask task, Date day) { - long result = 0; + long result; result = TimerTaskHelper.getTotalTime(task, day); Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/ReportView.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report; @@ -77,7 +84,7 @@ public class ReportView extends FrameView implements DocumentListener { /** serialVersionUID. */ - private static final long serialVersionUID = 547542299371326949L; +// private static final long serialVersionUID = 547542299371326949L; /** Class logger */ protected static Log log = LogFactory.getLog(ReportView.class); @@ -138,7 +145,7 @@ getFrame().setName("reportFrame"); this.core = core; - this.uncheckedTaskSet = new HashSet<TimerTask>(); + uncheckedTaskSet = new HashSet<TimerTask>(); // set title //setTitle(resourceMap.getString("reportTitle")); @@ -155,6 +162,7 @@ * Get main view component. * * TODO use less complicated UI (no gbl) + * @return */ protected JComponent getMainComponent() { @@ -335,7 +343,7 @@ public void generateReport() { // Choose selected project type - Type reportType = null; + Type reportType; if (radioByDay.isSelected()) { reportType = Type.BY_DAY_REPORT; } else if (radioByMonth.isSelected()) { Modified: trunk/src/main/java/org/chorem/jtimer/ui/report/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/report/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Reports UI. */ 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 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellComponent.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report.tree; @@ -63,7 +70,7 @@ Set<TimerTask> uncheckedTaskList) { this.core = core; this.parentTree = parentTree; - this.uncheckedTaskSet = uncheckedTaskList; + uncheckedTaskSet = uncheckedTaskList; } /** @@ -94,20 +101,20 @@ } // task name should not be "null" - this.setText(taskName); + setText(taskName); // add color if task is closed if (task.isClosed()) { - this.setForeground(Color.GRAY); + setForeground(Color.GRAY); } else { - this.setForeground(Color.BLACK); + setForeground(Color.BLACK); } // set checked ? if (uncheckedTaskSet.contains(task)) { - this.setSelected(false); + setSelected(false); } else { - this.setSelected(true); + setSelected(true); } } 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 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellEditor.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report.tree; @@ -178,7 +185,7 @@ } // special case, root node selection - if (parentTree.getModel().getRoot() == lastPathComponent) { + if (parentTree.getModel().getRoot().equals(lastPathComponent)) { for (TimerProject project : core.getData().getProjectsList()) { TreePath subTreePath = treePath.pathByAddingChild(project); 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 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeCellRenderer.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report.tree; 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 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/report/tree/CheckBoxTreeModel.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report.tree; @@ -46,7 +53,7 @@ public class CheckBoxTreeModel implements TreeModel { /** serialVersionUID. */ - private static final long serialVersionUID = -4312274996927222628L; +// private static final long serialVersionUID = -4312274996927222628L; /** Class logger. */ private static Log log = LogFactory.getLog(CheckBoxTreeModel.class); Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfo.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.system; @@ -34,5 +41,5 @@ * * @return system idle time in milliseconds */ - public long getIdleTime(); + long getIdleTime(); } Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/SystemInfoFactory.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.system; Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/UnsupportedSystemInfoException.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.system; @@ -36,7 +43,6 @@ * Constructor. */ public UnsupportedSystemInfoException() { - super(); } /** Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/ApplicationServices.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* * * Copyright (C) 2010 Code Lutin, Eric Chatellier * @@ -54,6 +78,6 @@ * * @see <a href="http://developer.apple.com/mac/library/documentation/Carbon/Reference/QuartzEventServicesRef/Reference/reference.html#//apple_ref/c/func/CGEventSourceSecondsSinceLastEventType">Quartz API</a> */ - public double CGEventSourceSecondsSinceLastEventType(int sourceStateId, + double CGEventSourceSecondsSinceLastEventType(int sourceStateId, int eventType); } \ No newline at end of file Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/MacOSSystemInfo.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* * * Copyright (C) 2010 Code Lutin, Eric Chatellier * Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/macos/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Mac OS specific system info implementation. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * System interface using JNA to get system information. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/unix/UnixSystemInfo.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.system.unix; @@ -57,7 +64,7 @@ @Override public long getIdleTime() { - long idleTime = 0; + long idleTime; try { idleTime = getXssIdleTime(); Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/unix/X11.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/unix/X11.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/unix/X11.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* Copyright (c) 2007 Timothy Wall, All Rights Reserved * * This library is free software; you can redistribute it and/or @@ -222,7 +246,7 @@ public WindowByReference() { super(XID.SIZE); } public Window getValue() { NativeLong value = getPointer().getNativeLong(0); - return value.longValue() == X11.None + return value.longValue() == None ? Window.None : new Window(value.longValue()); } } @@ -1296,7 +1320,7 @@ * DEFINITIONS OF SPECIFIC EVENTS *****************************************************************/ - public static class XEvent extends Union { + class XEvent extends Union { public int type; public XAnyEvent xany; public XKeyEvent xkey; @@ -1332,7 +1356,7 @@ public NativeLong[] pad = new NativeLong[24]; } - public static class XAnyEvent extends Structure { + class XAnyEvent extends Structure { public int type; public NativeLong serial; // # of last request processed by server public int send_event; // true if this came from a SendEvent request @@ -1378,7 +1402,7 @@ class XButtonReleasedEvent extends XButtonEvent { } - public static class XClientMessageEvent extends Structure { + class XClientMessageEvent extends Structure { public int type; // ClientMessage public NativeLong serial; // # of last request processed by server public int send_event; // true if this came from a SendEvent request Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/unix/Xss.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.system.unix; @@ -43,7 +50,7 @@ /** * XScreenSaverInfo struct */ - public static class XScreenSaverInfo extends Structure { + class XScreenSaverInfo extends Structure { public X11.Window window; /* screen saver window - may not exist */ public int state; /* ScreenSaverOff, ScreenSaverOn, ScreenSaverDisabled */ public int kind; /* ScreenSaverBlanked, ...Internal, ...External */ @@ -61,9 +68,9 @@ * * @return true if XScreenSaver extension is loaded * - * @see com.sun.jna.ptr.IntByReference + * @see IntByReference */ - public boolean XScreenSaverQueryExtension(X11.Display display, + boolean XScreenSaverQueryExtension(X11.Display display, IntByReference event_base, IntByReference error_base); /** @@ -71,7 +78,7 @@ * * @return XScreenSaverInfo instance */ - public XScreenSaverInfo XScreenSaverAllocInfo(); + XScreenSaverInfo XScreenSaverAllocInfo(); /** * XScreenSaverQueryInfo. @@ -81,6 +88,6 @@ * @param infos * @return status flag */ - public int XScreenSaverQueryInfo(X11.Display display, + int XScreenSaverQueryInfo(X11.Display display, X11.Drawable drawable, XScreenSaverInfo infos); } Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/unix/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/unix/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/unix/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Linux specific system info implementation. */ 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 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Kernel32.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.system.win32; @@ -43,5 +50,5 @@ * @return number of milliseconds that have elapsed since the system was * started. */ - public int GetTickCount(); + int GetTickCount(); } 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 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/User32.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.system.win32; @@ -42,7 +49,7 @@ /** * Contains the time of the last input. */ - public static class LASTINPUTINFO extends Structure { + class LASTINPUTINFO extends Structure { public int cbSize = 8; // / Tick count of when the last input event was received. @@ -55,5 +62,5 @@ * @param result time of the last input event, in milliseconds * @return boolean flag */ - public boolean GetLastInputInfo(LASTINPUTINFO result); + boolean GetLastInputInfo(LASTINPUTINFO result); } 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 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/Win32SystemInfo.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.system.win32; Modified: trunk/src/main/java/org/chorem/jtimer/ui/system/win32/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/system/win32/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/system/win32/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Windows specific system info implementation. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/SystrayManager.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.systray; @@ -80,7 +87,7 @@ protected JPopupTrayIcon trayIcon; /** Reference how many tasks are running. */ - protected int nbTasksRunning = 0; + protected int nbTasksRunning; /** Non running popup menu instance. */ protected JPopupMenu popup; @@ -312,7 +319,7 @@ --nbTasksRunning; } - String message = null; + String message; if (nbTasksRunning == 0) { message = resourceMap.getString("tooltipIdleText"); Modified: trunk/src/main/java/org/chorem/jtimer/ui/systray/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/systray/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/systray/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * System tray implementations. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/IdleDialog.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /* *##% * Copyright (C) 2009 Code Lutin, Chatellier Eric * @@ -116,7 +140,6 @@ // don't make reference on other parent // windows, cause idle to unlock some task // if parent window is hidden by systray - super(); // init resources map this.application = application; @@ -128,7 +151,7 @@ setTitle(resourceMap.getString("idleTitle")); setResizable(false); setModal(true); - setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(DO_NOTHING_ON_CLOSE); getRootPane().setLayout(new BorderLayout(1, 1)); getRootPane().add(getMainComponent(), BorderLayout.CENTER); @@ -274,7 +297,7 @@ // only the first call must display dialog // (can happen if multiples task are running) - boolean mustShow = false; + boolean mustShow; synchronized (idleDialog) { mustShow = !idleDialog.isVisible(); } Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RefreshTreeTask.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.tasks; @@ -51,7 +58,7 @@ * @param core core */ public RefreshTreeTask(TimerCore core) { - this.dataManager = core.getData(); + dataManager = core.getData(); } /* Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/RunTaskJob.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.tasks; @@ -338,7 +345,7 @@ // test if task want to stop synchronized (bWantToStop) { - dontWantToStop = !bWantToStop.booleanValue(); + dontWantToStop = !bWantToStop; } } @@ -439,7 +446,7 @@ public boolean isStopping() { boolean stopping; synchronized (bWantToStop) { - stopping = bWantToStop.booleanValue(); + stopping = bWantToStop; } return stopping; } Modified: trunk/src/main/java/org/chorem/jtimer/ui/tasks/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/tasks/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/tasks/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Job used to run tasks. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksCellRenderer.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.treetable; @@ -73,7 +80,6 @@ * @param core TimerCore */ public ProjectsAndTasksCellRenderer(TimerCore core) { - super(); // init runningTasks = new HashSet<TimerTask>(); Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksModel.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.treetable; @@ -76,7 +83,7 @@ protected List<String> columnIdentifiers; /** Show closed task property. Default to false. */ - protected boolean showClosedTask = false; + protected boolean showClosedTask; /** * Constructor. @@ -92,7 +99,7 @@ // remember this.projectsAndTaskTable = projectsAndTaskTable; - this.dataManager = core.getData(); + dataManager = core.getData(); this.columnIdentifiers = columnIdentifiers; } Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/ProjectsAndTasksTable.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.treetable; @@ -65,7 +72,6 @@ * @param core timer core */ public ProjectsAndTasksTable(Application application, TimerCore core) { - super(); // start with init i18n of table column name ApplicationContext ctxt = application.getContext(); @@ -86,19 +92,19 @@ // set renderer treeCellRenderer = new ProjectsAndTasksCellRenderer(core); - this.setTreeCellRenderer(treeCellRenderer); - this.setTreeTableModel(treeTableModel); + setTreeCellRenderer(treeCellRenderer); + setTreeTableModel(treeTableModel); // hack (work for white based theme) // swingx bug : https://swingx.dev.java.net/issues/show_bug.cgi?id=964 - this.setBackground(Color.WHITE); + setBackground(Color.WHITE); //treeTableModel.setSortColumn("Projects & Tasks"); core.getData().addDataEventListener(treeTableModel); // enable drag n drop - this.setDragEnabled(true); - this.setTransferHandler(new TimerTaskTransferHandler(application, core.getData())); + setDragEnabled(true); + setTransferHandler(new TimerTaskTransferHandler(application, core.getData())); } /** @@ -122,7 +128,7 @@ List<TimerTask> results = new ArrayList<TimerTask>(); // oula, c long de retouver la tache selectionnee - TreePath[] paths = this.getTreeSelectionModel().getSelectionPaths(); + TreePath[] paths = getTreeSelectionModel().getSelectionPaths(); if (paths != null) { for (TreePath path : paths) { @@ -154,7 +160,7 @@ List<TimerTask> results = new ArrayList<TimerTask>(); // oula, c long de retouver la tache selectionnee - TreePath[] paths = this.getTreeSelectionModel().getSelectionPaths(); + TreePath[] paths = getTreeSelectionModel().getSelectionPaths(); if (paths != null) { for (TreePath path : paths) { @@ -186,7 +192,7 @@ List<TimerProject> results = new ArrayList<TimerProject>(); // oula, c long de retouver la tache selectionnee - TreePath[] paths = this.getTreeSelectionModel().getSelectionPaths(); + TreePath[] paths = getTreeSelectionModel().getSelectionPaths(); if (paths != null) { for (TreePath path : paths) { Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTranferable.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.treetable.dnd; @@ -59,7 +66,7 @@ public TimerTaskTranferable(List<TimerTask> tasks) { // save task - this.tasksToTransfer = tasks; + tasksToTransfer = tasks; // build new DataFlavor try { @@ -78,7 +85,7 @@ public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException, IOException { - List<TimerTask> tasks = null; + List<TimerTask> tasks; if (flavor == null) { throw new IOException("flavor is null"); Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/TimerTaskTransferHandler.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.treetable.dnd; @@ -83,8 +90,8 @@ @Override public boolean canImport(JComponent cp, DataFlavor[] df) { - for (int i = 0; i < df.length; i++) { - if (df[i].equals(TimerTaskTranferable.myData)) { + for (DataFlavor aDf : df) { + if (aDf.equals(TimerTaskTranferable.myData)) { return true; } } @@ -174,7 +181,7 @@ log.debug("Transfert done"); } - if (type == TransferHandler.MOVE) { + if (type == MOVE) { try { ProjectsAndTasksTable treeTable = (ProjectsAndTasksTable) cp; Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/dnd/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Drag & drop implementation on treetable. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/treetable/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/treetable/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/treetable/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * TreeTable UI, for projects and tasks. */ Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/DurationEditor.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.widget; @@ -109,7 +116,7 @@ public void stateChanged(ChangeEvent e) { // clic on minute spinner - if (e.getSource() == minuteSpinnerModel) { + if (e.getSource().equals(minuteSpinnerModel)) { int value = minuteSpinnerModel.getNumber().intValue(); // up if (value >= 60) { @@ -132,7 +139,7 @@ } // clic on seconds spinner - else if (e.getSource() == secondSpinnerModel) { + else if (e.getSource().equals(secondSpinnerModel)) { int value = secondSpinnerModel.getNumber().intValue(); // up if (value >= 60) { Modified: trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/widget/JPopupTrayIcon.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.widget; Modified: trunk/src/main/java/org/chorem/jtimer/ui/ws/SwingConnectionInformationHandler.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/ws/SwingConnectionInformationHandler.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/ws/SwingConnectionInformationHandler.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.ws; @@ -143,7 +150,7 @@ super(application.getMainFrame(), true); // set name for swing application framework - super.setName(SwingConnectionInformationHandler.class.getName()); + setName(SwingConnectionInformationHandler.class.getName()); // init resources map ApplicationContext ctxt = application.getContext(); @@ -178,7 +185,7 @@ ProjectManagement managementService) { // try to get file information - ConnectionData data = null; + ConnectionData data; try { data = (ConnectionData) localStorage .load(getStorageName(managementService.getResourceName())); @@ -291,7 +298,7 @@ // set title String title = resourceMap.getString("askInformationTitle"); - super.setTitle(title); + setTitle(title); // build UI component setLayout(new GridBagLayout()); Modified: trunk/src/main/java/org/chorem/jtimer/ui/ws/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ui/ws/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ui/ws/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Graphical handlers for webservices. */ Modified: trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/utils/DailySortedMap.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.utils; @@ -30,7 +37,7 @@ * SortedMap that return a unique value * for all date for a day. * - * @see java.util.SortedMap + * @see SortedMap * @param <T> values type * * @author chatellier @@ -49,7 +56,6 @@ * of its keys. */ public DailySortedMap() { - super(); } /** @@ -82,7 +88,7 @@ super(m); } - /** + /* * {@inheritDoc} */ @Override @@ -93,7 +99,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -104,7 +110,7 @@ } - /** + /* * {@inheritDoc} */ @Override @@ -119,7 +125,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -129,7 +135,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -139,7 +145,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -154,7 +160,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -164,7 +170,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -174,7 +180,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -184,7 +190,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -194,7 +200,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -204,7 +210,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -214,7 +220,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -225,7 +231,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -235,7 +241,7 @@ } } - /** + /* * {@inheritDoc} */ @Override @@ -248,7 +254,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -259,7 +265,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override @@ -269,7 +275,7 @@ return result; } - /** + /* * {@inheritDoc} */ @Override Modified: trunk/src/main/java/org/chorem/jtimer/utils/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/utils/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/utils/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * JTimer util classes. */ Modified: trunk/src/main/java/org/chorem/jtimer/ws/ConnectionDataHandler.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/ConnectionDataHandler.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ws/ConnectionDataHandler.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ws; @@ -39,6 +46,6 @@ * @param managementService interface to remote service * @return connection data */ - public ConnectionData getConnectionInformation( + ConnectionData getConnectionInformation( ProjectManagement managementService); } Modified: trunk/src/main/java/org/chorem/jtimer/ws/ProjectManagement.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/ProjectManagement.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ws/ProjectManagement.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ws; @@ -45,42 +52,42 @@ * * @param endpoint service endpoint */ - public void setEndpoint(String endpoint); + void setEndpoint(String endpoint); /** * Set service endpoint. * * @return service endpoint */ - public String getEndpoint(); + String getEndpoint(); /** * Set service resource name. * * @param name service resource name */ - public void setResourceName(String name); + void setResourceName(String name); /** * Get service resource name. * * @return service resource name */ - public String getResourceName(); + String getResourceName(); /** * Set data manager. * * @param dataManager data manager */ - public void setDataManager(TimerDataManager dataManager); + void setDataManager(TimerDataManager dataManager); /** * Set connection handler. * * @param connectionDataHandler connection handler */ - public void setConnectionDataHandler(ConnectionDataHandler connectionDataHandler); + void setConnectionDataHandler(ConnectionDataHandler connectionDataHandler); /** * Get id/login map available on remote services. @@ -88,7 +95,7 @@ * @throws WebServiceException when call fail * @return all id/login couple */ - public Map<String, String> getIdAndLoginsMap() throws WebServiceException; + Map<String, String> getIdAndLoginsMap() throws WebServiceException; /** * Do login operation @@ -98,7 +105,7 @@ * @throws WebServiceException when call fail * @return user id */ - public String login(String user, String password) + String login(String user, String password) throws WebServiceException; /** @@ -110,7 +117,7 @@ * @return list of project * @see org.chorem.jtimer.entities.TimerProject */ - public List<TimerProject> getUserProjects(String userId) + List<TimerProject> getUserProjects(String userId) throws WebServiceException; /** @@ -120,7 +127,7 @@ * @param projects project list to synchronize * @throws WebServiceException when call fail */ - public void synchronize(String userId, List<TimerProject> projects) + void synchronize(String userId, List<TimerProject> projects) throws WebServiceException; /** @@ -132,6 +139,6 @@ * @param timeOfDay time in seconds * @throws WebServiceException when call fail */ - public void syncTask(String userId, TimerTask task, Date dateOfDay, + void syncTask(String userId, TimerTask task, Date dateOfDay, long timeOfDay) throws WebServiceException; } Modified: trunk/src/main/java/org/chorem/jtimer/ws/exception/WebServiceException.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/exception/WebServiceException.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ws/exception/WebServiceException.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ws.exception; Modified: trunk/src/main/java/org/chorem/jtimer/ws/exception/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/exception/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ws/exception/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Exception thrown by webservices. */ Modified: trunk/src/main/java/org/chorem/jtimer/ws/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ws/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Webservices layers. */ Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/AbstractXMLRPCClient.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/AbstractXMLRPCClient.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/AbstractXMLRPCClient.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ws.xmlrpc; Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/ChoremXMLRPCClient.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ws.xmlrpc; @@ -129,7 +136,7 @@ */ protected Object get(String serviceName, Object... args) throws XmlRpcException { - Object result = null; + Object result; try { result = super.get(resourceName + "." + serviceName, args); } catch (XmlRpcException e) { @@ -151,7 +158,7 @@ @Override public Map<String, String> getIdAndLoginsMap() throws WebServiceException { // method name - final String methodName = "getEmployees"; + String methodName = "getEmployees"; // ws call Map<String, String> idAndLogins = null; @@ -180,7 +187,7 @@ throws WebServiceException { // method name - final String methodName = "login"; + String methodName = "login"; // ws call String topiaId = null; @@ -209,7 +216,7 @@ throws WebServiceException { // method name // this is called getTasks in chorem - final String methodName = "getTasks"; + String methodName = "getTasks"; // map of timer name > timer project instance Map<String, TimerProject> result = new HashMap<String, TimerProject>(); @@ -343,7 +350,7 @@ protected Date getLastUpdate(String userId) { // method name - final String methodName = "getLastUpdate"; + String methodName = "getLastUpdate"; // date Date result = null; @@ -549,7 +556,7 @@ protected String addTask(String userId, String superTopiaId, String name) { // method name - final String methodName = "addTask"; + String methodName = "addTask"; // topiaId of added task String topiaId = null; @@ -589,7 +596,7 @@ long timeOfDay) throws WebServiceException { // method name - final String methodName = "syncTask"; + String methodName = "syncTask"; try { // debug @@ -686,7 +693,7 @@ log.info("Synchronization"); } - WSDaemon webServicesDeamon = new WSDaemon(this, this.dataManager); + WSDaemon webServicesDeamon = new WSDaemon(this, dataManager); webServicesDeamon.setConnectionDataHandler(connectionDataHandler); Timer timer = new Timer(); Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/WSDaemon.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2007,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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ws.xmlrpc; Modified: trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/package-info.java =================================================================== --- trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/package-info.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/java/org/chorem/jtimer/ws/xmlrpc/package-info.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ /** * Chorem webservices implementation. */ Modified: trunk/src/main/resources/JTimer.properties =================================================================== --- trunk/src/main/resources/JTimer.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/JTimer.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # JTimer.properties file ########################## Modified: trunk/src/main/resources/JTimer_default.properties =================================================================== --- trunk/src/main/resources/JTimer_default.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/JTimer_default.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # JTimer.properties file ########################## Modified: trunk/src/main/resources/log4j.properties =================================================================== --- trunk/src/main/resources/log4j.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/log4j.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Global logging configuration log4j.rootLogger=WARN, stdout Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/resources/JTimer.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # JTimer.properties file # # Warning : This file is located in org.chorem.jtimer.resources @@ -132,11 +156,11 @@ input.addAnnotationTitle=Add annotation input.addAnnotationMessage=Annotation for task "%s" : -#�Error +#�Error action.invalidActionTitle=Can't do action action.missingErrorMessage=Error message is missing (%s) -#�listeners errors +#�listeners errors vetoable.common.duplicated.project.name=A project already exists with that name at this level ! vetoable.common.duplicated.task.name=A task already exists with that name at this level ! vetoable.common.merge.invalid.types=Can't merge project and task ! @@ -145,6 +169,6 @@ vetoable.saver.invalid.task.characters=Task name contains invalid characters ! vetoable.ws.chorem.cant.modify.synchronized.project=Can't do this action on a synchronized project ! -#�Start fail i18n +#�Start fail i18n startFail.title=Error startFail.message=${Application.title} fail to init.\nCheck that ${Application.title} is not already launched. Modified: trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/resources/JTimer_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Resources for @Actions defined in jTimer newProject.Action.text = Nouveau projet newProject.Action.icon = bookmark-new.png @@ -111,11 +135,11 @@ input.addAnnotationTitle=Ajouter une annotation input.addAnnotationMessage=Annotation pour la t\u00E2che "%s" : -#�Error +#�Error action.invalidActionTitle=Impossible d'effectuer cette action action.missingErrorMessage=Message d'erreur manquant (%s) -#�listeners errors +#�listeners errors vetoable.common.duplicated.project.name=Un projet avec ce nom existe d\u00E9j\u00E0 \u00E0 ce niveau ! vetoable.common.duplicated.task.name=Une t\u00E2che avec ce nom existe d\u00E9j\u00E0 \u00E0 ce niveau ! vetoable.common.merge.invalid.types=Impossible de fusionner un projet et une t\u00E2che ! @@ -124,6 +148,6 @@ vetoable.saver.invalid.characters=Le nom contient des caract\u00E8res invalide ! vetoable.ws.chorem.cant.modify.synchronized.project=Impossible d'effectuer cette action sur un projet synchronis\u00E9 ! -#�Start fail i18n +#�Start fail i18n startFail.title=Erreur startFail.message=${Application.title} n'a pas r\u00E9ussi \u00E0 s'initiliser.\nV\u00E9rifiez que ${Application.title} n'est pas d\u00E9j\u00E0 lanc\u00E9. \ No newline at end of file Modified: trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### alert.title = ${Application.title} - Alerts alert.alertlist = Alert list : alert.type = Type Modified: trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/alert/resources/AlertEditor_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### alert.title = ${Application.title} - Alertes alert.alertlist = Listes des alertes : alert.type = Type 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 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Report i18n reportTitle=${Application.title} - Report reportOptions=Options 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 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/report/resources/ReportView_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Report i18n reportTitle=${Application.title} - Rapport reportOptions=Options Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,7 +1,31 @@ -#�About common +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +#�About common aboutIcon = jtimer-logo-orange.jpg -#�About i18n +#�About i18n aboutTitle = About ${Application.title} aboutHtmlTitle = About ${Application.title} aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Please, report any bug you can found.<html> Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/HelpFrame_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,4 +1,28 @@ -#�About i18n +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +#�About i18n aboutTitle = \u00C0 propos de ${Application.title} aboutHtmlTitle = \u00C0 propos de ${Application.title} aboutHtml = <html><b>${Application.title} - ${Application.version}</b><br /><br />Copyright 2007 - 2010, Code Lutin.<br /><br /><a href=\"${project.url}\">${project.url}</a><br /><br />Merci de rapporter les bugs de ${Application.title}.<html> Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # status bar ui loadingMessage= Loading\u2026 idleMessage = Idle Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/StatusBar_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # status bar ui loadingMessage= Chargement en cours\u2026 idleMessage = Inactif Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### editor.title = Edit task apply.Action.text = Apply Modified: trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/resources/TimerTaskEditor_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### editor.title = \u00C9dition de la t\u00E2che apply.Action.text = Appliquer Modified: trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,4 +1,28 @@ -#�tray icon +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +#�tray icon idleImage = jtimer-40-orange.png runningImage = jtimer-40-green.png idleDetectImage = jtimer-40-grey.png Modified: trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/systray/resources/SystrayManager_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # tray i18n tooltipIdleText = ${Application.title} tooltipRunningTaskText = ${Application.title} - %d t\u00E2che en cours Modified: trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # idle i18n idleTitle = Idle detect idleIcon = appointment-new.png Modified: trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/IdleDialog_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # idle i18n idleTitle = Inactivit\u00E9 d\u00E9tect\u00E9e idleMessage = Vous avez \u00E9t\u00E9 inactif pendant %d minutes. Modified: trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### alert.alertIcon=bell48.png # messages Modified: trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/tasks/resources/RunTaskJob_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # messages alert.title = Alerte alert.dailyAlertMessage = La t\u00E2che '%s' a atteint %s pour ce jour ! Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,9 +1,33 @@ -#�Move UI i18n +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +#�Move UI i18n move.task.title=Move task move.task.confirmation.message=Do you want to move task '%s'\nto '%s' ? move.tasks.confirmation.message=Do you want to move %d tasks\nto '%s' ? -#�error +#�error action.invalidActionTitle=Can't do action action.missingErrorMessage=Error message is missing (%s) vetoable.ws.chorem.cant.modify.synchronized.project=Can't do this action on a synchonized project \ No newline at end of file Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/dnd/resources/TimerTaskTransferHandler_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,9 +1,33 @@ -#�Move UI i18n +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +#�Move UI i18n move.task.title=D\u00E9placement de la t\u00E2che move.task.message=\u00CAtes vous s\u00FBr de vouloir d\u00E9placer la t\u00E2che '%s'\nvers '%s' ? move.tasks.message=\u00CAtes vous s\u00FBr de vouloir d\u00E9placer %d t\u00E2ches\nvers '%s' ? -#�error +#�error action.invalidActionTitle=Impossible d'effectuer cette action action.missingErrorMessage=Message d'erreur manquant (%s) vetoable.ws.chorem.cant.modify.synchronized.project=Impossible d'effectuer cette action sur un projet synchronis\u00E9 \ No newline at end of file Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,4 +1,28 @@ -#�Table i18n +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +#�Table i18n projectsAndTaskColumnName = Projects & Tasks todayTimeColumnName = Today totalTimeColumnName = Total \ No newline at end of file Modified: trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/treetable/resources/ProjectsAndTasksTable_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,4 +1,28 @@ -#�Table i18n +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### +#�Table i18n projectsAndTaskColumnName = Projets et t\u00E2ches todayTimeColumnName = Aujourd'hui totalTimeColumnName = Total \ No newline at end of file Modified: trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Webservice connection prompt askInformationMessage=Choose your login to connect to "%s" : askInformationTitle=Connection information needed Modified: trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties =================================================================== --- trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/main/resources/org/chorem/jtimer/ui/ws/resources/SwingConnectionInformationHandler_fr.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Webservice connection prompt askInformationMessage=Choisissez votre identifiant pour vous connecter \u00E0 "%s" : askInformationTitle=Information de connexion n\u00E9cessaire Modified: trunk/src/site/en/rst/configuration.rst =================================================================== --- trunk/src/site/en/rst/configuration.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/en/rst/configuration.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Configuration ============= Modified: trunk/src/site/en/rst/contribute/i18n.rst =================================================================== --- trunk/src/site/en/rst/contribute/i18n.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/en/rst/contribute/i18n.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - I18N ==== Modified: trunk/src/site/en/rst/devel/fileformat.rst =================================================================== --- trunk/src/site/en/rst/devel/fileformat.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/en/rst/devel/fileformat.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - File format =========== Modified: trunk/src/site/en/rst/devel/index.rst =================================================================== --- trunk/src/site/en/rst/devel/index.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/en/rst/devel/index.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Developer ========= Modified: trunk/src/site/en/rst/devel/roadmap.rst =================================================================== --- trunk/src/site/en/rst/devel/roadmap.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/en/rst/devel/roadmap.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Roadmap ======= Modified: trunk/src/site/en/rst/devel/saf.rst =================================================================== --- trunk/src/site/en/rst/devel/saf.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/en/rst/devel/saf.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Swing application framework =========================== Modified: trunk/src/site/en/rst/index.rst =================================================================== --- trunk/src/site/en/rst/index.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/en/rst/index.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Home ==== Modified: trunk/src/site/en/rst/screenshots.rst =================================================================== --- trunk/src/site/en/rst/screenshots.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/en/rst/screenshots.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Screenshots =========== Modified: trunk/src/site/rst/configuration.rst =================================================================== --- trunk/src/site/rst/configuration.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/rst/configuration.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Configuration ============= Modified: trunk/src/site/rst/contribute/i18n.rst =================================================================== --- trunk/src/site/rst/contribute/i18n.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/rst/contribute/i18n.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - I18N ==== Modified: trunk/src/site/rst/devel/fileformat.rst =================================================================== --- trunk/src/site/rst/devel/fileformat.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/rst/devel/fileformat.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Format de fichier ================= Modified: trunk/src/site/rst/devel/index.rst =================================================================== --- trunk/src/site/rst/devel/index.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/rst/devel/index.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Developpeur =========== Modified: trunk/src/site/rst/devel/roadmap.rst =================================================================== --- trunk/src/site/rst/devel/roadmap.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/rst/devel/roadmap.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Roadmap ======= Modified: trunk/src/site/rst/devel/saf.rst =================================================================== --- trunk/src/site/rst/devel/saf.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/rst/devel/saf.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Swing application framework =========================== Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/rst/index.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Accueil ======= Modified: trunk/src/site/rst/screenshots.rst =================================================================== --- trunk/src/site/rst/screenshots.rst 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/rst/screenshots.rst 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * jTimer +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2007 - 2010 CodeLutin +.. * %% +.. * 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 3 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, see +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. +.. * #L% +.. - Copies d'écran ============== Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/site_en.xml 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,5 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + jTimer + + $Id$ + $HeadURL$ + %% + Copyright (C) 2007 - 2010 CodeLutin + %% + 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 3 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, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project name="${project.name}"> <publishDate format="MM-dd-yyyy" /> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/site/site_fr.xml 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,5 +1,30 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + jTimer + + $Id$ + $HeadURL$ + %% + Copyright (C) 2007 - 2010 CodeLutin + %% + 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 3 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, see + <http://www.gnu.org/licenses/gpl-3.0.html>. + #L% + --> + <project name="${project.name}"> <skin> Modified: trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/AbstractJTimerTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer; @@ -74,6 +81,7 @@ /** * Redefinit les proprietes utilisées pour les tests. + * @throws IOException */ protected void initDataDirectory() throws IOException { Modified: trunk/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/JTimerFactoryTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer; @@ -22,7 +29,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.jtimer.JTimerFactory; import org.chorem.jtimer.io.Saver; import org.chorem.jtimer.ws.ProjectManagement; import org.testng.Assert; Modified: trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/data/CommonVetoableTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.data; Modified: trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/data/TimerDataManagerTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.data; Modified: trunk/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/entities/ConnectionDataTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,25 +1,31 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.entities; import org.chorem.jtimer.AbstractJTimerTest; -import org.chorem.jtimer.entities.ConnectionData; import org.testng.Assert; import org.testng.annotations.Test; Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerAlertTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.entities; Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerProjectTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.entities; Modified: trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/entities/TimerTaskTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.entities; Modified: trunk/src/test/java/org/chorem/jtimer/io/AbstractSaverTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/io/AbstractSaverTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/io/AbstractSaverTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.io; Modified: trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/io/GTimerIncrementalSaverTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.io; @@ -191,7 +198,7 @@ long totalTime = 0; for (Long time : task.getAllDaysAndTimes().values()) { - totalTime += time.longValue(); + totalTime += time; } Assert.assertEquals(11391, totalTime); Modified: trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/ui/report/ReportGeneratorTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report; Modified: trunk/src/test/java/org/chorem/jtimer/ui/report/ReportUtilsTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/report/ReportUtilsTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/ui/report/ReportUtilsTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.report; Modified: trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/ui/system/SystemInfoFactoryTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.system; @@ -22,9 +29,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.AbstractJTimerTest; import org.chorem.jtimer.ui.report.ReportGeneratorTest; -import org.chorem.jtimer.ui.system.SystemInfo; -import org.chorem.jtimer.ui.system.SystemInfoFactory; -import org.chorem.jtimer.ui.system.UnsupportedSystemInfoException; import org.testng.Assert; import org.testng.annotations.Test; Modified: trunk/src/test/java/org/chorem/jtimer/ui/widget/DurationEditorTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/ui/widget/DurationEditorTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/ui/widget/DurationEditorTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.ui.widget; Modified: trunk/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java =================================================================== --- trunk/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/java/org/chorem/jtimer/utils/DailySortedMapTest.java 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,20 +1,27 @@ -/* *##% - * Copyright (C) 2008, 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. - * +/* + * #%L + * jTimer + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2007 - 2010 CodeLutin + * %% + * 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 3 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. - *##%*/ + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ package org.chorem.jtimer.utils; Modified: trunk/src/test/resources/JTimerTestRelatif.properties =================================================================== --- trunk/src/test/resources/JTimerTestRelatif.properties 2010-11-21 14:32:34 UTC (rev 2759) +++ trunk/src/test/resources/JTimerTestRelatif.properties 2010-11-21 18:12:47 UTC (rev 2760) @@ -1,3 +1,27 @@ +### +# #%L +# jTimer +# +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2007 - 2010 CodeLutin +# %% +# 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 3 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, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### # Service class jtimer.service.class=org.chorem.jtimer.ws.xmlrpc.ChoremXMLRPCClient # Service resource to use for previous class