- Isis-fish-commits - mailman.cloud.codelutin.com

r1809 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 14 Feb '09

14 Feb '09

Author: tchemit Date: 2009-02-14 11:38:09 +0000 (Sat, 14 Feb 2009) New Revision: 1809 Modified: isis-fish/trunk/pom.xml Log: bump i18n to 0.9-SNAPSHOT Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-12 17:54:09 UTC (rev 1808) +++ isis-fish/trunk/pom.xml 2009-02-14 11:38:09 UTC (rev 1809) @@ -346,6 +346,7 @@ <topia.version>2.1.3-SNAPSHOT</topia.version> <lutinmatrix.version>1.2-SNAPSHOT</lutinmatrix.version> <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version> + <i18n.version>0.9-SNAPSHOT</i18n.version> <lutinwidget.version>0.12</lutinwidget.version> <generator.version>0.64-SNAPSHOT</generator.version>

1 0

r1808 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 17:54:09 +0000 (Thu, 12 Feb 2009) New Revision: 1808 Modified: isis-fish/trunk/pom.xml Log: l'utilisation de 2 proprietes generator.version ?\195?\167a aide p?\195?\180... Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-12 07:41:14 UTC (rev 1807) +++ isis-fish/trunk/pom.xml 2009-02-12 17:54:09 UTC (rev 1808) @@ -342,8 +342,7 @@ <labs.project>isis-fish</labs.project>  - <jaxx.version>1.1-SNAPSHOT</jaxx.version> - <generator.version>0.63</generator.version> + <jaxx.version>1.1-SNAPSHOT</jaxx.version> <topia.version>2.1.3-SNAPSHOT</topia.version> <lutinmatrix.version>1.2-SNAPSHOT</lutinmatrix.version> <lutinutil.version>1.0.3-SNAPSHOT</lutinutil.version>

1 0

r1807 - isis-fish/trunk
by thimel＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: thimel Date: 2009-02-12 07:41:14 +0000 (Thu, 12 Feb 2009) New Revision: 1807 Modified: isis-fish/trunk/ Log: Add 'bin' to svn:ignore Property changes on: isis-fish/trunk ___________________________________________________________________ Name: svn:ignore - maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin

1 0

r1806 - isis-fish/trunk
by thimel＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: thimel Date: 2009-02-12 07:23:27 +0000 (Thu, 12 Feb 2009) New Revision: 1806 Modified: isis-fish/trunk/pom.xml Log: Remove hudson profile, add -Xmx128m in MAVEN_OPTS in Hudson Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-12 00:16:52 UTC (rev 1805) +++ isis-fish/trunk/pom.xml 2009-02-12 07:23:27 UTC (rev 1806) @@ -734,23 +734,6 @@ </build> </profile> -  - <profile> - <id>hudson</id> - <build> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <fork>true</fork> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> </project>

1 0

r1805 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/ui/input
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 00:16:52 +0000 (Thu, 12 Feb 2009) New Revision: 1805 Modified: isis-fish/trunk/pom.xml isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx Log: do not generate deprecated stuff from ToPIA Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-11 20:12:09 UTC (rev 1804) +++ isis-fish/trunk/pom.xml 2009-02-12 00:16:52 UTC (rev 1805) @@ -389,6 +389,10 @@ <srcGenDest>${maven.gen.dir}/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <excludeTemplates> + <value>org.codelutin.topia.generator.EntityEnumGenerator</value> + <value>org.codelutin.topia.generator.EntityProviderGenerator</value> + </excludeTemplates> <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>fr.ifremer.isisfish</defaultPackage> <copyVersionDir>${project.basedir}/src/main/resources/oldmappings/%MODELNAME% Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-02-11 20:12:09 UTC (rev 1804) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2009-02-12 00:16:52 UTC (rev 1805) @@ -66,7 +66,6 @@ import javax.swing.tree.TreePath; import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.topia.TopiaException; -import fr.ifremer.isisfish.IsisFishEntityEnum; import jaxx.runtime.JAXXContextEntryDef; import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode; import jaxx.runtime.swing.navigation.NavigationTreeModelBuilder;

1 0

r1804 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 20:12:09 +0000 (Wed, 11 Feb 2009) New Revision: 1804 Modified: isis-fish/trunk/pom.xml Log: ajout d'un profile pour hudson en attendant de comprendre pourquoi ca ne compile pas sur hudson... Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-11 14:09:20 UTC (rev 1803) +++ isis-fish/trunk/pom.xml 2009-02-11 20:12:09 UTC (rev 1804) @@ -729,6 +729,24 @@ </plugins> </build> </profile> + +  + <profile> + <id>hudson</id> + <build> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <fork>true</fork> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + </profile> + </profiles> </project>

1 0

r1803 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: chatellier Date: 2009-02-11 14:09:20 +0000 (Wed, 11 Feb 2009) New Revision: 1803 Modified: isis-fish/trunk/pom.xml Log: Test de changement de phase Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-11 11:01:43 UTC (rev 1802) +++ isis-fish/trunk/pom.xml 2009-02-11 14:09:20 UTC (rev 1803) @@ -379,7 +379,7 @@ <executions> <execution> <id>Generator</id> - <phase>process-sources</phase> + <phase>generate-sources</phase> <configuration> <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml> <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest>

1 0

r1802 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 11:01:43 +0000 (Wed, 11 Feb 2009) New Revision: 1802 Modified: isis-fish/trunk/pom.xml Log: ajout repository codelutin dans les poms des projets + fix generator plugin parameter Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-10 13:08:25 UTC (rev 1801) +++ isis-fish/trunk/pom.xml 2009-02-11 11:01:43 UTC (rev 1802) @@ -366,7 +366,7 @@ <jnlpCodebase>${project.url}</jnlpCodebase>  -  + <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase> </properties> <build> @@ -381,7 +381,7 @@ <id>Generator</id> <phase>process-sources</phase> <configuration> - <srcDirZUml>${project.basedir}/src/main/xmi</srcDirZUml> + <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml> <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <extractedPackages>fr.ifremer.isisfish</extractedPackages> @@ -530,6 +530,23 @@ <url>${maven.scm.url}</url> </scm> +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + <profiles> <profile> <id>release-profile</id>

1 0

r1801 - isis-fish/trunk
by chatellier＠users.labs.libre-entreprise.org 10 Feb '09

10 Feb '09

Author: chatellier Date: 2009-02-10 13:08:25 +0000 (Tue, 10 Feb 2009) New Revision: 1801 Modified: isis-fish/trunk/pom.xml Log: Update config Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2009-02-08 14:26:28 UTC (rev 1800) +++ isis-fish/trunk/pom.xml 2009-02-10 13:08:25 UTC (rev 1801) @@ -381,7 +381,7 @@ <id>Generator</id> <phase>process-sources</phase> <configuration> - <srcDirUml>${project.basedir}/src/main/xmi</srcDirUml> + <srcDirZUml>${project.basedir}/src/main/xmi</srcDirZUml> <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest> <fullPackagePath>fr.ifremer.isisfish</fullPackagePath> <extractedPackages>fr.ifremer.isisfish</extractedPackages>

1 0

r1800 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish
by tchemit＠users.labs.libre-entreprise.org 08 Feb '09

08 Feb '09

Author: tchemit Date: 2009-02-08 14:26:28 +0000 (Sun, 08 Feb 2009) New Revision: 1800 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java Log: utilisation d'un WidnowAdapter plutot que WindowListener (vu qu'on ne surcharge q'un seul evenement...) Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-08 14:06:23 UTC (rev 1799) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/IsisFish.java 2009-02-08 14:26:28 UTC (rev 1800) @@ -77,7 +77,7 @@ import fr.ifremer.isisfish.vcs.VCSException; import fr.ifremer.isisfish.vcs.VCSFactory; import fr.ifremer.isisfish.vcs.VetoableActionListener; -import java.awt.event.WindowListener; +import java.awt.event.WindowAdapter; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -426,36 +426,12 @@ WelcomeUI welcome = new WelcomeUI(); // Set to exit on close welcome.setDefaultCloseOperation(WelcomeUI.DO_NOTHING_ON_CLOSE); - welcome.addWindowListener(new WindowListener() { + welcome.addWindowListener(new WindowAdapter() { @Override - public void windowOpened(WindowEvent e) { - } - - @Override public void windowClosing(WindowEvent e) { ((WelcomeUI)e.getSource()).close(); } - - @Override - public void windowClosed(WindowEvent e) { - } - - @Override - public void windowIconified(WindowEvent e) { - } - - @Override - public void windowDeiconified(WindowEvent e) { - } - - @Override - public void windowActivated(WindowEvent e) { - } - - @Override - public void windowDeactivated(WindowEvent e) { - } }); // add context welcome.setVisible(true);

1 0