Isis-fish-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- 3175 discussions
r2209 - in isis-fish/tags: . isis-fish-3.2.0.4
by chatellier＠users.labs.libre-entreprise.org 07 May '09
by chatellier＠users.labs.libre-entreprise.org 07 May '09
07 May '09
Author: chatellier
Date: 2009-05-07 23:11:01 +0000 (Thu, 07 May 2009)
New Revision: 2209
Added:
isis-fish/tags/isis-fish-3.2.0.4/
isis-fish/tags/isis-fish-3.2.0.4/pom.xml
Removed:
isis-fish/tags/isis-fish-3.2.0.4/pom.xml
Log:
[maven-release-plugin] copy for tag isis-fish-3.2.0.4
Copied: isis-fish/tags/isis-fish-3.2.0.4 (from rev 2207, isis-fish/trunk)
Deleted: isis-fish/tags/isis-fish-3.2.0.4/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2009-05-07 20:00:29 UTC (rev 2207)
+++ isis-fish/tags/isis-fish-3.2.0.4/pom.xml 2009-05-07 23:11:01 UTC (rev 2209)
@@ -1,755 +0,0 @@
-<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>
-
- <!-- ************************************************************* -->
- <!-- *** POM Relationships *************************************** -->
- <!-- ************************************************************* -->
- <parent>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinproject</artifactId>
- <version>3.5</version>
- </parent>
-
- <groupId>ifremer</groupId>
- <artifactId>isis-fish</artifactId>
- <version>3.2.0.4-SNAPSHOT</version>
-
- <!-- POM Relationships : Inheritance : Dependencies -->
- <dependencies>
-
- <!--Compile-->
- <!--Librairies CodeLutin-->
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinutil</artifactId>
- <version>${lutinutil.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin.topia</groupId>
- <artifactId>topia-persistence</artifactId>
- <version>${topia.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>topia-service</artifactId>
- <version>${topia.service.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinmatrix</artifactId>
- <version>${lutinmatrix.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinwidget</artifactId>
- <version>${lutinwidget.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!--Jaxx-->
- <dependency>
- <groupId>org.codelutin.jaxx</groupId>
- <artifactId>jaxx-runtime-swing</artifactId>
- <version>${jaxx.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin.jaxx</groupId>
- <artifactId>jaxx-runtime-validator</artifactId>
- <version>${jaxx.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.codelutin.jaxx</groupId>
- <artifactId>jaxx-runtime-swing-widget</artifactId>
- <version>${jaxx.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Utilisé dans les scripts -->
- <dependency>
- <groupId>org.codelutin</groupId>
- <artifactId>lutinj2r</artifactId>
- <version>${lutinj2r.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!--Commons-->
- <dependency>
- <groupId>commons-jxpath</groupId>
- <artifactId>commons-jxpath</artifactId>
- <version>1.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-math</groupId>
- <artifactId>commons-math</artifactId>
- <version>1.2</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-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>1.8.0</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
- <scope>compile</scope>
- </dependency>
-
- <!--Other-->
- <dependency>
- <groupId>jfreechart</groupId>
- <artifactId>jfreechart</artifactId>
- <version>0.9.3</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>jcommon</groupId>
- <artifactId>jcommon</artifactId>
- <version>0.7.0</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- XML-RPC Client and server (don't try 3.1.1) -->
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-client</artifactId>
- <version>${xmlrpc.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.xmlrpc</groupId>
- <artifactId>xmlrpc-server</artifactId>
- <version>${xmlrpc.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- encore utilise pour les pre-scripts -->
- <dependency>
- <groupId>org.beanshell</groupId>
- <artifactId>bsh</artifactId>
- <version>2.0b4</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>openmap</groupId>
- <artifactId>openmap</artifactId>
- <version>${openmap.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>sshtools</groupId>
- <artifactId>j2ssh-common</artifactId>
- <version>${sshtool.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>sshtools</groupId>
- <artifactId>j2ssh-core</artifactId>
- <version>${sshtool.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.41</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- Utilisé lors de l'import xml v2 (entre autre) -->
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- Change this dependence if you change database -->
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.1.111</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- aspectwerkz -->
- <dependency>
- <groupId>aspectwerkz</groupId>
- <artifactId>aspectwerkz</artifactId>
- <version>${aspectwerkz.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>aspectwerkz</groupId>
- <artifactId>aspectwerkz-jdk5</artifactId>
- <version>${aspectwerkz.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>aspectwerkz</groupId>
- <artifactId>aspectwerkz-core</artifactId>
- <version>${aspectwerkz.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <!-- ssj pour les calculs stockastiques -->
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>ssj</artifactId>
- <version>2.1.1</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>Blas</artifactId>
- <version>20081007</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>colt</artifactId>
- <version>20081007</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>interpreter</artifactId>
- <version>1.6.8</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>language</artifactId>
- <version>1.6.7</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>logger</artifactId>
- <version>1.6.4</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>ssj</groupId>
- <artifactId>optimization</artifactId>
- <version>20081007</version>
- <scope>runtime</scope>
- </dependency>
- <!-- fin ssj pour les calculs stockastiques -->
-
- <!-- debut svnkit pour communication subversion -->
- <dependency>
- <groupId>org.tmatesoft</groupId>
- <artifactId>svnkit</artifactId>
- <version>1.2.3.5521</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>com.trilead</groupId>
- <artifactId>trilead-ssh2</artifactId>
- <version>build213-svnkit-1.2</version>
- <scope>runtime</scope>
- </dependency>
- <!-- fin svnkit pour communication subversion -->
-
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.15</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.6.0</version>
- </dependency>
- </dependencies>
-
- <!-- ************************************************************* -->
- <!-- *** Project Information ************************************* -->
- <!-- ************************************************************* -->
- <name>IsisFish</name>
- <description>Simulateur de pecherie complexe.</description>
- <inceptionYear>1999</inceptionYear>
-
- <licenses>
- <license>
- <name>GPL</name>
- <url>http://www.gnu.org/copyleft/gpl.html</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
-
- <!-- ************************************************************* -->
- <!-- *** Build Settings ****************************************** -->
- <!-- ************************************************************* -->
- <packaging>jar</packaging>
-
- <properties>
- <!-- id du projet du labs -->
- <labs.id>8</labs.id>
-
- <!-- nom du projet du labs -->
- <labs.project>isis-fish</labs.project>
-
- <!-- Custom version -->
- <jaxx.version>1.5</jaxx.version>
- <topia.version>2.1.4</topia.version>
- <topia.service.version>1.0.2</topia.service.version>
- <lutinmatrix.version>1.3</lutinmatrix.version>
- <lutinutil.version>1.0.5</lutinutil.version>
- <i18n.version>0.9</i18n.version>
- <lutinwidget.version>0.14</lutinwidget.version>
- <generator.version>0.64</generator.version>
- <lutinj2r.version>0.4</lutinj2r.version>
- <jrst.version>0.8.4</jrst.version>
- <license-switcher.version>0.6</license-switcher.version>
- <openmap.version>4.6.4</openmap.version>
- <aspectwerkz.version>2.0</aspectwerkz.version>
- <sshtool.version>0.2.2</sshtool.version>
- <xmlrpc.version>3.1.2</xmlrpc.version>
-
- <!-- for compilation test to run -->
- <maven.test.forkMode>once</maven.test.forkMode>
-
- <!--Main class in JAR -->
- <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class>
-
- <!-- jnlp -->
- <keystorepath>${codelutin.keystorepath}</keystorepath>
- <keystorealias>CodeLutin</keystorealias>
- <keystorepass>codelutin</keystorepass>
- <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory>
-
- <jnlpCodebase>${project.url}</jnlpCodebase>
- <!-- to test jnlp file locally -->
- <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase>
- </properties>
-
- <build>
- <plugins>
-
- <plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-generator-plugin</artifactId>
- <version>${generator.version}</version>
- <executions>
- <execution>
- <id>Generator</id>
- <phase>generate-sources</phase>
- <configuration>
- <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml>
- <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest>
- <fullPackagePath>fr.ifremer.isisfish</fullPackagePath>
- <extractedPackages>fr.ifremer.isisfish</extractedPackages>
- <!--Config generator-->
- <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%
- </copyVersionDir>
- <copyVersionFiles>**/*.hbm.xml</copyVersionFiles>
- <copyOverwrite>true</copyOverwrite>
- </configuration>
- <goals>
- <goal>zargo2xmi</goal>
- <goal>xmi2objectmodel</goal>
- <goal>generate</goal>
- <goal>copyVersionFiles</goal>
- </goals>
- </execution>
- </executions>
- <dependencies>
- <dependency>
- <groupId>org.codelutin.topia</groupId>
- <artifactId>topia-persistence</artifactId>
- <version>${topia.version}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
- </plugin>
-
- <plugin>
- <groupId>org.codelutin.jaxx</groupId>
- <artifactId>maven-jaxx-plugin</artifactId>
- <version>${jaxx.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- <configuration>
- <extraImports>
- <value>jaxx.runtime.SwingUtil</value>
- <value>static jaxx.runtime.Util.getStringValue</value>
- </extraImports>
- <addSourcesToClassPath>true</addSourcesToClassPath>
- <addProjectClassPath>true</addProjectClassPath>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-i18n-plugin</artifactId>
- <version>${i18n.version}</version>
- <configuration>
- <entries>
- <entry>
- <basedir>${maven.gen.dir}/java/</basedir>
- <specificGoal>parserJava</specificGoal>
- <includes>
- <param>**\/**UI.java</param>
- </includes>
- </entry>
- </entries>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>parserJava</goal>
- <goal>gen</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- Always process jrst files, but only called on pre-site phase -->
- <plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-jrst-plugin</artifactId>
- <version>${jrst.version}</version>
- <configuration>
- <defaultLocale>fr</defaultLocale>
- </configuration>
- <executions>
- <execution>
- <phase>pre-site</phase>
- <goals>
- <goal>jrst</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- </execution>
- </executions>
- </plugin>
- </plugins>
-
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- <classpathPrefix>lib/</classpathPrefix>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- </build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.5</version>
- <configuration>
- <links>
- <link>http://java.sun.com/javase/6/docs/api/</link>
- <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link>
- <link>http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/</link>
- <link>http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/</link>
- </links>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- </plugins>
- </reporting>
-
- <!-- ************************************************************* -->
- <!-- *** Build Environment ************************************** -->
- <!-- ************************************************************* -->
- <scm>
- <connection>${maven.scm.connection}</connection>
- <developerConnection>${maven.scm.developerConnection}</developerConnection>
- <url>${maven.scm.url}</url>
- </scm>
-
- <!--Code Lutin Repository-->
- <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>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
-
- <!-- always add license and third-party files to classpath -->
- <plugin>
- <groupId>org.codelutin</groupId>
- <artifactId>maven-license-switcher-plugin</artifactId>
- <version>${license-switcher.version}</version>
- <configuration>
- <licenseName>${license-switcher.licenseName}</licenseName>
- </configuration>
- <executions>
- <execution>
- <id>attach-licenses</id>
- <goals>
- <!--goal>license</goal-->
- <goal>third-party</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <!-- Ajout des libs signe par Sun dans un fichier jnlp separe -->
- <execution>
- <id>JnlpSun</id>
- <phase>verify</phase>
- <configuration>
- <tasks>
- <mkdir dir="${jnlp.build.directory}" />
- <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false">
- <filterset>
- <filter token="lib-javahelp" value="javahelp-2.0.02.jar" />
- <filter token="lib-activation" value="activation-1.1.jar" />
- <filter token="lib-mail" value="mail-1.4.jar" />
- <filter token="url" value="${jnlpCodebase}" />
- </filterset>
- </copy>
- <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false">
- <filterset>
- <filter token="lib" value="jxlayer-3.0.1.jar" />
- <filter token="url" value="${jnlpCodebase}" />
- </filterset>
- </copy>
-
- <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false">
- <fileset dir="${project.build.directory}/lib">
- <include name="javahelp-2.0.02.jar" />
- <include name="activation-1.1.jar" />
- <include name="mail-1.4.jar" />
- <include name="jxlayer-3.0.1.jar" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
-
- <execution>
- <id>JnlpToSite</id>
- <phase>pre-site</phase>
- <configuration>
- <tasks>
- <mkdir dir="${maven.site.gen.dir}/resources" />
- <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false">
- <fileset dir="${jnlp.build.directory}">
- <include name="**" />
- </fileset>
- <!-- should be better to use the deployed assembly in lutinbuilder ? -->
- <fileset dir="target">
- <include name="${project.build.finalName}-bin.zip" />
- </fileset>
-
- </copy>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo.webstart</groupId>
- <artifactId>webstart-maven-plugin</artifactId>
- <version>1.0-alpha-2-cl_20090204</version>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>jnlp-inline</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <force>false</force>
- <dependencies>
- <excludes>
- <exclude>javax.help:javahelp</exclude>
- <exclude>javax.mail:mail</exclude>
- <exclude>javax.activation:activation</exclude>
- <exclude>org.swinglabs:jxlayer</exclude>
- </excludes>
- </dependencies>
- <libPath>lib</libPath>
- <extensions>
- <sun>sun.jnlp</sun>
- <jxlayer>jxlayer.jnlp</jxlayer>
- </extensions>
- <jnlp>
- <outputFile>isis-fish-v3.jnlp</outputFile>
- <mainClass>${maven.jar.main.class}</mainClass>
- <allPermissions>true</allPermissions>
- <offlineAllowed>true</offlineAllowed>
- </jnlp>
-
- <sign>
- <keystore>${keystorepath}</keystore>
- <keypass />
- <storepass>${keystorepass}</storepass>
- <storetype />
- <alias>${keystorealias}</alias>
- <validity />
- <dnameCn />
- <dnameOu />
- <dnameO />
- <dnameL />
- <dnameSt />
- <dnameC />
- <verify>true</verify>
- <keystoreConfig>
- <delete>false</delete>
- <gen>false</gen>
- </keystoreConfig>
- </sign>
- <pack200>false</pack200>
- <gzip>true</gzip>
- <verbose>false</verbose>
- </configuration>
- </plugin>
-
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-3</version>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
-</project>
Copied: isis-fish/tags/isis-fish-3.2.0.4/pom.xml (from rev 2208, isis-fish/trunk/pom.xml)
===================================================================
--- isis-fish/tags/isis-fish-3.2.0.4/pom.xml (rev 0)
+++ isis-fish/tags/isis-fish-3.2.0.4/pom.xml 2009-05-07 23:11:01 UTC (rev 2209)
@@ -0,0 +1,755 @@
+<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>
+
+ <!-- ************************************************************* -->
+ <!-- *** POM Relationships *************************************** -->
+ <!-- ************************************************************* -->
+ <parent>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinproject</artifactId>
+ <version>3.5</version>
+ </parent>
+
+ <groupId>ifremer</groupId>
+ <artifactId>isis-fish</artifactId>
+ <version>3.2.0.4</version>
+
+ <!-- POM Relationships : Inheritance : Dependencies -->
+ <dependencies>
+
+ <!--Compile-->
+ <!--Librairies CodeLutin-->
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinutil</artifactId>
+ <version>${lutinutil.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin.topia</groupId>
+ <artifactId>topia-persistence</artifactId>
+ <version>${topia.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>topia-service</artifactId>
+ <version>${topia.service.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinmatrix</artifactId>
+ <version>${lutinmatrix.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinwidget</artifactId>
+ <version>${lutinwidget.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!--Jaxx-->
+ <dependency>
+ <groupId>org.codelutin.jaxx</groupId>
+ <artifactId>jaxx-runtime-swing</artifactId>
+ <version>${jaxx.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin.jaxx</groupId>
+ <artifactId>jaxx-runtime-validator</artifactId>
+ <version>${jaxx.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codelutin.jaxx</groupId>
+ <artifactId>jaxx-runtime-swing-widget</artifactId>
+ <version>${jaxx.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Utilisé dans les scripts -->
+ <dependency>
+ <groupId>org.codelutin</groupId>
+ <artifactId>lutinj2r</artifactId>
+ <version>${lutinj2r.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!--Commons-->
+ <dependency>
+ <groupId>commons-jxpath</groupId>
+ <artifactId>commons-jxpath</artifactId>
+ <version>1.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-math</groupId>
+ <artifactId>commons-math</artifactId>
+ <version>1.2</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-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.8.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!--Other-->
+ <dependency>
+ <groupId>jfreechart</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>0.9.3</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jcommon</groupId>
+ <artifactId>jcommon</artifactId>
+ <version>0.7.0</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- XML-RPC Client and server (don't try 3.1.1) -->
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+ <artifactId>xmlrpc-client</artifactId>
+ <version>${xmlrpc.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.xmlrpc</groupId>
+ <artifactId>xmlrpc-server</artifactId>
+ <version>${xmlrpc.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- encore utilise pour les pre-scripts -->
+ <dependency>
+ <groupId>org.beanshell</groupId>
+ <artifactId>bsh</artifactId>
+ <version>2.0b4</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>openmap</groupId>
+ <artifactId>openmap</artifactId>
+ <version>${openmap.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>sshtools</groupId>
+ <artifactId>j2ssh-common</artifactId>
+ <version>${sshtool.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>sshtools</groupId>
+ <artifactId>j2ssh-core</artifactId>
+ <version>${sshtool.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.41</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Utilisé lors de l'import xml v2 (entre autre) -->
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- Change this dependence if you change database -->
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.1.111</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- aspectwerkz -->
+ <dependency>
+ <groupId>aspectwerkz</groupId>
+ <artifactId>aspectwerkz</artifactId>
+ <version>${aspectwerkz.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>aspectwerkz</groupId>
+ <artifactId>aspectwerkz-jdk5</artifactId>
+ <version>${aspectwerkz.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>aspectwerkz</groupId>
+ <artifactId>aspectwerkz-core</artifactId>
+ <version>${aspectwerkz.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- ssj pour les calculs stockastiques -->
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>ssj</artifactId>
+ <version>2.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>Blas</artifactId>
+ <version>20081007</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>colt</artifactId>
+ <version>20081007</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>interpreter</artifactId>
+ <version>1.6.8</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>language</artifactId>
+ <version>1.6.7</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>logger</artifactId>
+ <version>1.6.4</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ssj</groupId>
+ <artifactId>optimization</artifactId>
+ <version>20081007</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- fin ssj pour les calculs stockastiques -->
+
+ <!-- debut svnkit pour communication subversion -->
+ <dependency>
+ <groupId>org.tmatesoft</groupId>
+ <artifactId>svnkit</artifactId>
+ <version>1.2.3.5521</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.trilead</groupId>
+ <artifactId>trilead-ssh2</artifactId>
+ <version>build213-svnkit-1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- fin svnkit pour communication subversion -->
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.15</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.6.0</version>
+ </dependency>
+ </dependencies>
+
+ <!-- ************************************************************* -->
+ <!-- *** Project Information ************************************* -->
+ <!-- ************************************************************* -->
+ <name>IsisFish</name>
+ <description>Simulateur de pecherie complexe.</description>
+ <inceptionYear>1999</inceptionYear>
+
+ <licenses>
+ <license>
+ <name>GPL</name>
+ <url>http://www.gnu.org/copyleft/gpl.html</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+
+ <!-- ************************************************************* -->
+ <!-- *** Build Settings ****************************************** -->
+ <!-- ************************************************************* -->
+ <packaging>jar</packaging>
+
+ <properties>
+ <!-- id du projet du labs -->
+ <labs.id>8</labs.id>
+
+ <!-- nom du projet du labs -->
+ <labs.project>isis-fish</labs.project>
+
+ <!-- Custom version -->
+ <jaxx.version>1.5</jaxx.version>
+ <topia.version>2.1.4</topia.version>
+ <topia.service.version>1.0.2</topia.service.version>
+ <lutinmatrix.version>1.3</lutinmatrix.version>
+ <lutinutil.version>1.0.5</lutinutil.version>
+ <i18n.version>0.9</i18n.version>
+ <lutinwidget.version>0.14</lutinwidget.version>
+ <generator.version>0.64</generator.version>
+ <lutinj2r.version>0.4</lutinj2r.version>
+ <jrst.version>0.8.4</jrst.version>
+ <license-switcher.version>0.6</license-switcher.version>
+ <openmap.version>4.6.4</openmap.version>
+ <aspectwerkz.version>2.0</aspectwerkz.version>
+ <sshtool.version>0.2.2</sshtool.version>
+ <xmlrpc.version>3.1.2</xmlrpc.version>
+
+ <!-- for compilation test to run -->
+ <maven.test.forkMode>once</maven.test.forkMode>
+
+ <!--Main class in JAR -->
+ <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class>
+
+ <!-- jnlp -->
+ <keystorepath>${codelutin.keystorepath}</keystorepath>
+ <keystorealias>CodeLutin</keystorealias>
+ <keystorepass>codelutin</keystorepass>
+ <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory>
+
+ <jnlpCodebase>${project.url}</jnlpCodebase>
+ <!-- to test jnlp file locally -->
+ <jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase>
+ </properties>
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <groupId>org.codelutin</groupId>
+ <artifactId>maven-generator-plugin</artifactId>
+ <version>${generator.version}</version>
+ <executions>
+ <execution>
+ <id>Generator</id>
+ <phase>generate-sources</phase>
+ <configuration>
+ <srcDirZuml>${project.basedir}/src/main/xmi</srcDirZuml>
+ <srcXmiDest>${maven.gen.dir}/xmi/</srcXmiDest>
+ <fullPackagePath>fr.ifremer.isisfish</fullPackagePath>
+ <extractedPackages>fr.ifremer.isisfish</extractedPackages>
+ <!--Config generator-->
+ <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%
+ </copyVersionDir>
+ <copyVersionFiles>**/*.hbm.xml</copyVersionFiles>
+ <copyOverwrite>true</copyOverwrite>
+ </configuration>
+ <goals>
+ <goal>zargo2xmi</goal>
+ <goal>xmi2objectmodel</goal>
+ <goal>generate</goal>
+ <goal>copyVersionFiles</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.codelutin.topia</groupId>
+ <artifactId>topia-persistence</artifactId>
+ <version>${topia.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codelutin.jaxx</groupId>
+ <artifactId>maven-jaxx-plugin</artifactId>
+ <version>${jaxx.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate</goal>
+ </goals>
+ <configuration>
+ <extraImports>
+ <value>jaxx.runtime.SwingUtil</value>
+ <value>static jaxx.runtime.Util.getStringValue</value>
+ </extraImports>
+ <addSourcesToClassPath>true</addSourcesToClassPath>
+ <addProjectClassPath>true</addProjectClassPath>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codelutin</groupId>
+ <artifactId>maven-i18n-plugin</artifactId>
+ <version>${i18n.version}</version>
+ <configuration>
+ <entries>
+ <entry>
+ <basedir>${maven.gen.dir}/java/</basedir>
+ <specificGoal>parserJava</specificGoal>
+ <includes>
+ <param>**\/**UI.java</param>
+ </includes>
+ </entry>
+ </entries>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>parserJava</goal>
+ <goal>gen</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- Always process jrst files, but only called on pre-site phase -->
+ <plugin>
+ <groupId>org.codelutin</groupId>
+ <artifactId>maven-jrst-plugin</artifactId>
+ <version>${jrst.version}</version>
+ <configuration>
+ <defaultLocale>fr</defaultLocale>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>pre-site</phase>
+ <goals>
+ <goal>jrst</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>copy-dependencies</id>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ </build>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
+ <configuration>
+ <links>
+ <link>http://java.sun.com/javase/6/docs/api/</link>
+ <link>http://lutinutil.labs.libre-entreprise.org/lutinutil/apidocs/</link>
+ <link>http://lutinmatrix.labs.libre-entreprise.org/lutinmatrix/apidocs/</link>
+ <link>http://topia.labs.libre-entreprise.org/topia/topia-persistence/apidocs/</link>
+ </links>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <!-- ************************************************************* -->
+ <!-- *** Build Environment ************************************** -->
+ <!-- ************************************************************* -->
+ <scm>
+ <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.4</connection>
+ <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.4</developerConnection>
+ <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url>
+ </scm>
+
+ <!--Code Lutin Repository-->
+ <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>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+
+ <!-- always add license and third-party files to classpath -->
+ <plugin>
+ <groupId>org.codelutin</groupId>
+ <artifactId>maven-license-switcher-plugin</artifactId>
+ <version>${license-switcher.version}</version>
+ <configuration>
+ <licenseName>${license-switcher.licenseName}</licenseName>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-licenses</id>
+ <goals>
+ <!--goal>license</goal-->
+ <goal>third-party</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <!-- Ajout des libs signe par Sun dans un fichier jnlp separe -->
+ <execution>
+ <id>JnlpSun</id>
+ <phase>verify</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${jnlp.build.directory}" />
+ <copy file="${project.basedir}/src/main/jnlp/sun.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false">
+ <filterset>
+ <filter token="lib-javahelp" value="javahelp-2.0.02.jar" />
+ <filter token="lib-activation" value="activation-1.1.jar" />
+ <filter token="lib-mail" value="mail-1.4.jar" />
+ <filter token="url" value="${jnlpCodebase}" />
+ </filterset>
+ </copy>
+ <copy file="${project.basedir}/src/main/jnlp/jxlayer.jnlp" verbose="${maven.verbose}" todir="${jnlp.build.directory}" failonerror="false">
+ <filterset>
+ <filter token="lib" value="jxlayer-3.0.1.jar" />
+ <filter token="url" value="${jnlpCodebase}" />
+ </filterset>
+ </copy>
+
+ <copy verbose="${maven.verbose}" todir="${jnlp.build.directory}/lib" failonerror="false">
+ <fileset dir="${project.build.directory}/lib">
+ <include name="javahelp-2.0.02.jar" />
+ <include name="activation-1.1.jar" />
+ <include name="mail-1.4.jar" />
+ <include name="jxlayer-3.0.1.jar" />
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+
+ <execution>
+ <id>JnlpToSite</id>
+ <phase>pre-site</phase>
+ <configuration>
+ <tasks>
+ <mkdir dir="${maven.site.gen.dir}/resources" />
+ <copy todir="${maven.site.gen.dir}/resources" verbose="true" failonerror="false" overwrite="false">
+ <fileset dir="${jnlp.build.directory}">
+ <include name="**" />
+ </fileset>
+ <!-- should be better to use the deployed assembly in lutinbuilder ? -->
+ <fileset dir="target">
+ <include name="${project.build.finalName}-bin.zip" />
+ </fileset>
+
+ </copy>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo.webstart</groupId>
+ <artifactId>webstart-maven-plugin</artifactId>
+ <version>1.0-alpha-2-cl_20090204</version>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>jnlp-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <force>false</force>
+ <dependencies>
+ <excludes>
+ <exclude>javax.help:javahelp</exclude>
+ <exclude>javax.mail:mail</exclude>
+ <exclude>javax.activation:activation</exclude>
+ <exclude>org.swinglabs:jxlayer</exclude>
+ </excludes>
+ </dependencies>
+ <libPath>lib</libPath>
+ <extensions>
+ <sun>sun.jnlp</sun>
+ <jxlayer>jxlayer.jnlp</jxlayer>
+ </extensions>
+ <jnlp>
+ <outputFile>isis-fish-v3.jnlp</outputFile>
+ <mainClass>${maven.jar.main.class}</mainClass>
+ <allPermissions>true</allPermissions>
+ <offlineAllowed>true</offlineAllowed>
+ </jnlp>
+
+ <sign>
+ <keystore>${keystorepath}</keystore>
+ <keypass />
+ <storepass>${keystorepass}</storepass>
+ <storetype />
+ <alias>${keystorealias}</alias>
+ <validity />
+ <dnameCn />
+ <dnameOu />
+ <dnameO />
+ <dnameL />
+ <dnameSt />
+ <dnameC />
+ <verify>true</verify>
+ <keystoreConfig>
+ <delete>false</delete>
+ <gen>false</gen>
+ </keystoreConfig>
+ </sign>
+ <pack200>false</pack200>
+ <gzip>true</gzip>
+ <verbose>false</verbose>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-3</version>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>verify</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
1
0
Author: chatellier
Date: 2009-05-07 23:10:56 +0000 (Thu, 07 May 2009)
New Revision: 2208
Modified:
isis-fish/trunk/pom.xml
Log:
[maven-release-plugin] prepare release isis-fish-3.2.0.4
Modified: isis-fish/trunk/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2009-05-07 20:00:29 UTC (rev 2207)
+++ isis-fish/trunk/pom.xml 2009-05-07 23:10:56 UTC (rev 2208)
@@ -13,7 +13,7 @@
<groupId>ifremer</groupId>
<artifactId>isis-fish</artifactId>
- <version>3.2.0.4-SNAPSHOT</version>
+ <version>3.2.0.4</version>
<!-- POM Relationships : Inheritance : Dependencies -->
<dependencies>
@@ -552,9 +552,9 @@
<!-- *** Build Environment ************************************** -->
<!-- ************************************************************* -->
<scm>
- <connection>${maven.scm.connection}</connection>
- <developerConnection>${maven.scm.developerConnection}</developerConnection>
- <url>${maven.scm.url}</url>
+ <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.4</connection>
+ <developerConnection>scm:svn:svn+ssh://chatellier at labs.libre-entreprise.org/svnroot/isis-fish/isis-fish/tags/isis-fish-3.2.0.4</developerConnection>
+ <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/isis-fish/tags/…</url>
</scm>
<!--Code Lutin Repository-->
1
0
07 May '09
Author: chatellier
Date: 2009-05-07 20:00:29 +0000 (Thu, 07 May 2009)
New Revision: 2207
Modified:
isis-fish/trunk/src/main/assembly/go.sh
Log:
Fix quote pb
Modified: isis-fish/trunk/src/main/assembly/go.sh
===================================================================
--- isis-fish/trunk/src/main/assembly/go.sh 2009-05-07 19:42:17 UTC (rev 2206)
+++ isis-fish/trunk/src/main/assembly/go.sh 2009-05-07 20:00:29 UTC (rev 2207)
@@ -1,6 +1,6 @@
#!/bin/sh
-MEMORY=-Xms512M -Xmx512M
-JRIARGS=-Djava.library.path=jri -DR.type=jni
+MEMORY="-Xms512M -Xmx512M"
+JRIARGS="-Djava.library.path=jri -DR.type=jni"
java $MEMORY $JRIARGS -jar ${project.build.finalName}.${project.packaging} "$@" &> debug.txt
\ No newline at end of file
1
0
r2206 - isis-fish/trunk/src/main/resources/icons
by chatellier＠users.labs.libre-entreprise.org 07 May '09
by chatellier＠users.labs.libre-entreprise.org 07 May '09
07 May '09
Author: chatellier
Date: 2009-05-07 19:42:17 +0000 (Thu, 07 May 2009)
New Revision: 2206
Modified:
isis-fish/trunk/src/main/resources/icons/building.png
isis-fish/trunk/src/main/resources/icons/building_add.png
Log:
Bad commit (corrupted)
Modified: isis-fish/trunk/src/main/resources/icons/building.png
===================================================================
--- isis-fish/trunk/src/main/resources/icons/building.png 2009-05-07 18:57:06 UTC (rev 2205)
+++ isis-fish/trunk/src/main/resources/icons/building.png 2009-05-07 19:42:17 UTC (rev 2206)
@@ -1,207 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="fr ">
-
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Labs: Isis-fish: dépÎt de sources</title>
- <link rel="alternate" title="Labs - Project News Highlights RSS" href="/export/rss_sfnews.php" type="application/rss+xml"/>
- <link rel="alternate" title="Labs - New Projects RSS" href="/export/rss_sfprojects.php" type="application/rss+xml"/>
-
- <script language="JavaScript" type="text/javascript">
- <!--
-
- function admin_window(adminurl) {
- AdminWin = window.open( adminurl, 'AdminWindow','scrollbars=yes,resizable=yes, toolbar=yes, height=400, width=400, top=2, left=2');
- AdminWin.focus();
- }
- function help_window(helpurl) {
- HelpWin = window.open( helpurl,'HelpWindow','scrollbars=yes,resizable=yes,toolbar=no,height=400,width=400');
- }
- // -->
- </script>
-
-<style type="text/css">
- <!--
- BODY {
- margin-top: 3;
- margin-left: 3;
- margin-right: 3;
- margin-bottom: 3;
- background-image: url("/themes/le/images/theme-top-blue.png");
- }
- ol,ul,p,body,td,tr,th,form { font-family: verdana,arial,helvetica,sans-serif; font-size:small;
- color: #333333; }
-
- h1 { font-size: x-large; font-family: verdana,arial,helvetica,sans-serif; }
- h2 { font-size: large; font-family: verdana,arial,helvetica,sans-serif; }
- h3 { font-size: medium; font-family: verdana,arial,helvetica,sans-serif; }
- h4 { font-size: small; font-family: verdana,arial,helvetica,sans-serif; }
- h5 { font-size: x-small; font-family: verdana,arial,helvetica,sans-serif; }
- h6 { font-size: xx-small; font-family: verdana,arial,helvetica,sans-serif; }
-
- pre,tt { font-family: courier,sans-serif }
-
- a:link { text-decoration:none; color: #0000be }
- a:visited { text-decoration:none; color: #0000be }
- a:active { text-decoration:none }
- a:hover { text-decoration:underline; color:red }
-
- .titlebar { color: black; text-decoration: none; font-weight: bold; }
- a.tablink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
- a.tablink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
- a.tablink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
- a.tabsellink { color: #0000be; text-decoration: none; font-weight: bold; font-size: x-small; }
- a.tabsellink:visited { color: #0000be; text-decoration: none; font-weight: bold; font-size: x-small; }
- a.tabsellink:hover { text-decoration: none; color: #0000be; font-weight: bold; font-size: x-small; }
- -->
-</style>
-<link rel="stylesheet" type="text/css" href="/plugins/scmcvs/cvsweb/css/cvsweb.css" /><link rel="stylesheet" type="text/css" href="/plugins/scmsvn/viewcvs/styles.css" /></head>
-
-<body>
-
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
- <tr>
- <!--<td><a href="/"><img src="http://labs.libre-entreprise.org//themes/le/images/logo.png" border="0" alt="" width="81" height="62" /></a></td>-->
- <td style="color: #FFFFFF; font-size: large; font-weight: bold;" valign="middle">Labs.libre-entreprise.org</td>
- <td>
- <form action="/search/" method="get">
- <table border="0" cellpadding="0" cellspacing="0">
- <tr><td>
- <div align="center" style="font-size:smaller"><select name="type_of_search"><option value="soft">Logiciel/Groupe</option>
-<option value="people">Personne</option>
-</select></div></td><td> </td><td><input type="text" size="12" name="words" value="" /></td><td> </td><td><input type="submit" name="Search" value="Rechercher" /></td></tr></table></form></td>
- <td align="right"> <b><a style="color: #FFFFFF" href="/account/logout.php">Se déconnecter</a></b><br />
- <b><a style="color: #FFFFFF" href="/account/">Mon compte</a></b>
- </td>
- <td> </td>
- </tr>
-
-</table>
-
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
- <tr>
- <td> </td>
- <td colspan="3">
-
-
-
- <!-- start tabs -->
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td valign="top" width="10" background="/themes/le/images/theme-toptab-end-notselected.png"><img src="/themes/le/images/clear.png" height="25" width="10" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/">Accueil</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/my/">Ma page</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/softwaremap/">Arbre des projets</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/snippet/">Boite à outils</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-selected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-selected-bg.png" width="20%" align="center"><a class="tabsellink" href="/projects/isis-fish/">Isis-fish</a></td>
- <td valign="top" width="10" background="/themes/le/images/theme-toptab-selected-end.png"><img src="/themes/le/images/clear.png" height="2" width="10" alt="" /></td></tr><tr><td colspan="12" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="3" height="1" bgcolor="#e0e0e0"><img src="/themes/le/images/clear.png" height="1" width="10" /></td></tr>
- </table>
-
- <!-- end tabs -->
-
- </td>
- <td> </td>
- </tr>
-
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/topleft.png" height="9" width="9" alt="" /></td>
- <td bgcolor="#E0E0E0" width="30"><img src="/themes/le/images/clear.png" width="30" height="1" alt="" /></td>
- <td bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
- <td bgcolor="#E0E0E0" width="30"><img src="/themes/le/images/clear.png" width="30" height="1" alt="" /></td>
- <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/topright.png" height="9" width="9" alt="" /></td>
- </tr>
-
- <tr>
-
- <!-- Outer body row -->
-
- <td bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="10" height="1" alt="" /></td>
- <td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
-
- <!-- Inner Tabs / Shell -->
-
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td> </td>
- <td>
-
-
- <!-- start tabs -->
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td valign="top" width="10" background="/themes/le/images/theme-bottomtab-end-notselected.png"><img src="/themes/le/images/clear.png" height="25" width="10" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/projects/isis-fish/">En bref</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/tracker/?group_id=8">Suivi</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/mail/?group_id=8">Listes</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/pm/?group_id=8">Tâches</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/docman/?group_id=8">Documents</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/survey/?group_id=8">Sondages</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/news/?group_id=8">Annonces</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-selected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-selected-bg.png" width="10%" align="center"><a class="tabsellink" href="/scm/?group_id=8">Sources</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-selected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/frs/?group_id=8">Fichiers</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/plugins/wiki/index.php?id=8&type=g">Wiki</a></td>
- <td valign="top" width="10" background="/themes/le/images/theme-bottomtab-notselected-end.png"><img src="/themes/le/images/clear.png" height="2" width="10" alt="" /></td></tr><tr><td colspan="21" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="3" height="1" bgcolor="white"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="6" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td></tr>
- </table>
-
- <!-- end tabs -->
- </td>
- <td> </td>
- </tr>
- <tr>
- <td align="left" bgcolor="#ffffff" width="9"><img src="/themes/le/images/tabs/topleft-inner.png" height="9" width="9" alt="" /></td>
- <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
- <td align="right" bgcolor="#ffffff" width="9"><img src="/themes/le/images/tabs/topright-inner.png" height="9" width="9" alt="" /></td>
- </tr>
-
- <tr>
- <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="10" height="1" alt="" /></td>
- <td valign="top" width="99%" bgcolor="white">
-
- <link href="/plugins/scmsvn/styles.css" rel="stylesheet" TYPE="text/css">
-IHDR óÿagAMA¯È7étEXtSoftwareAdobe ImageReadyqÉe<ŸIDAT8ËMKQßÇ¢L¢€°t¡µZ¹
-lÓºUž
-ú-
-ZŽížj$mÚŽ)!Jh1Ù:ãýhî¥!éÀá îÜó÷¹sôãÏÑ(¢O;ÙÜ잯JËòù<§Ö*\×ud³Yøý~B!Äãq¥£ýŠ5
-Aÿ8É5ÉØØ¢°B³3j1(g"`yÀ0îÓ4eðX¹ã ¡þ¹Ò°¬JXS±ª3Æ#š×ëœÂÆ_ºüÎáÞ
-ÄGqðòÁkõÏ¥F³àùFoú.z^|ñÏÎ\rÊ5äÁ
-_µúeH¥RPU¢È5H bŒãqŒhŽo¢4: ÈWne5MÓDd, åZ®Ö×míìÖ šr>âôá¬Eð©bÿj_Ä€K±Ù64Lßé|¿V¹9s28 6$}VwáíãE\8?%l·=zìÙÃò*(
-žòJÅ_¯2ק2&ÌÛmzâ ÓìJð9î4 IEND®B` <!-- end main body row -->
-
-
- </td>
- <td width="10" bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="2" height="1" alt="" /></td>
- </tr>
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomleft-inner.png" height="11" width="11" alt="" /></td>
- <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
- <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomright-inner.png" height="11" width="11" alt="" /></td>
- </tr>
- </table>
-
- <!-- end inner body row -->
-
- </td>
- <td width="10" bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="2" height="1" alt="" /></td>
- </tr>
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomleft.png" height="9" width="9" alt="" /></td>
- <td bgcolor="#E0E0E0" colspan="3"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
- <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomright.png" height="9" width="9" alt="" /></td>
- </tr>
-</table>
-
-<!-- PLEASE LEAVE "Powered By GForge" on your site -->
-<br />
-<center>
-<a href="http://gforge.org/"><img src="/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0" /></a>
-</center>
-
-
-</body>
-</html>
+PNG
+
+
+IHDR
+sRGB®Î ébKGDÿÿÿ œ§ pHYs tIMEÙ :15Çã IDAT8ËÍÏO\U¿ûî}ó à à TB©4¡1i5éBYYÆÝŽ÷.Ú€K£UÓnÆÔbBéBlb£ŠeTQk)aøõ7Œ÷û ŠI·ä.ÎY|ùNιGðžpáS144ÐÒÓÓeK)ÄÚÚŠ·žøçÎÄÄ!¯ñßdll\ôöÈÈÐ{¹\fÔ¶í€ðýÀ-7þžýúäÌÔÔµÆ+W®|ýÖñã
+|ÛR
+)
+ Ã@F£Á'ýôøñüçß}?3s³ šÎ»Êçsßd2£XViÊ @är]ï8Nõ«l6û>ðûQ Ñßÿ&}}œã©TêT""à 5µZõubq
+}ýý¯}ræÌF¡ZXV¬@JI,f <)åŸÆ4±B©œ¢S)$phPÊóê>=Öj.==lÛ¢¥Åƶc@5BaiììxärYÉ$ bq
ryÍioOR©ÔÒÀ4Š¹g£Ä4ÍŒVs Ãà :;ûcÔÔr*áÁ_;;::ÉdÒÌÏ/ÑÙÙA:ÝF,fî8N
+×»<|øš-ÎQ*=?
+lçäÉaQ,qÝ:¶m³Žô[[[loo£µ&ÍNw`Û6õzjÕ%Ïa1?ÿËaà³g30pl[ë¥LŽ1 Ö(Ð:$ cY1€Ó)twwìܺuyqçÎtüüùÒ µ5N[[)
+¢ Qáºu66*XVéé bJH$DooÁ[ Pȱ¶¶çùh C
+DXR{ÑZóâÅ*eÙù|*ú³)Nx#šV}</ #|?`}}R©ÖB!O6Á4MŠbpðõðÆe³Épw7àêÕË.]ºŒ2HŽbÆ.FDH¹·>B gÝÝvwbâËWWM-K@+m®[K
+}ÝZ¬VkAï{øŸO£¡ÙÙñš×=*gëîÝoïߟ}s¢§ôÚ ²,{äìÙ±w
cýŸßHon:JkMwwN$ìÊêêÊòœ{S³Õjeø
+x) È9`P)ÕHŽ÷ ! îºÛÏÀ_Þ¿0/2à ýËÿÿøåÔJHfmIEND®B`
\ No newline at end of file
Modified: isis-fish/trunk/src/main/resources/icons/building_add.png
===================================================================
--- isis-fish/trunk/src/main/resources/icons/building_add.png 2009-05-07 18:57:06 UTC (rev 2205)
+++ isis-fish/trunk/src/main/resources/icons/building_add.png 2009-05-07 19:42:17 UTC (rev 2206)
@@ -1,202 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="fr ">
-
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <title>Labs: Isis-fish: dépÎt de sources</title>
- <link rel="alternate" title="Labs - Project News Highlights RSS" href="/export/rss_sfnews.php" type="application/rss+xml"/>
- <link rel="alternate" title="Labs - New Projects RSS" href="/export/rss_sfprojects.php" type="application/rss+xml"/>
-
- <script language="JavaScript" type="text/javascript">
- <!--
-
- function admin_window(adminurl) {
- AdminWin = window.open( adminurl, 'AdminWindow','scrollbars=yes,resizable=yes, toolbar=yes, height=400, width=400, top=2, left=2');
- AdminWin.focus();
- }
- function help_window(helpurl) {
- HelpWin = window.open( helpurl,'HelpWindow','scrollbars=yes,resizable=yes,toolbar=no,height=400,width=400');
- }
- // -->
- </script>
-
-<style type="text/css">
- <!--
- BODY {
- margin-top: 3;
- margin-left: 3;
- margin-right: 3;
- margin-bottom: 3;
- background-image: url("/themes/le/images/theme-top-blue.png");
- }
- ol,ul,p,body,td,tr,th,form { font-family: verdana,arial,helvetica,sans-serif; font-size:small;
- color: #333333; }
-
- h1 { font-size: x-large; font-family: verdana,arial,helvetica,sans-serif; }
- h2 { font-size: large; font-family: verdana,arial,helvetica,sans-serif; }
- h3 { font-size: medium; font-family: verdana,arial,helvetica,sans-serif; }
- h4 { font-size: small; font-family: verdana,arial,helvetica,sans-serif; }
- h5 { font-size: x-small; font-family: verdana,arial,helvetica,sans-serif; }
- h6 { font-size: xx-small; font-family: verdana,arial,helvetica,sans-serif; }
-
- pre,tt { font-family: courier,sans-serif }
-
- a:link { text-decoration:none; color: #0000be }
- a:visited { text-decoration:none; color: #0000be }
- a:active { text-decoration:none }
- a:hover { text-decoration:underline; color:red }
-
- .titlebar { color: black; text-decoration: none; font-weight: bold; }
- a.tablink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
- a.tablink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
- a.tablink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
- a.tabsellink { color: #0000be; text-decoration: none; font-weight: bold; font-size: x-small; }
- a.tabsellink:visited { color: #0000be; text-decoration: none; font-weight: bold; font-size: x-small; }
- a.tabsellink:hover { text-decoration: none; color: #0000be; font-weight: bold; font-size: x-small; }
- -->
-</style>
-<link rel="stylesheet" type="text/css" href="/plugins/scmcvs/cvsweb/css/cvsweb.css" /><link rel="stylesheet" type="text/css" href="/plugins/scmsvn/viewcvs/styles.css" /></head>
-
-<body>
-
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
- <tr>
- <!--<td><a href="/"><img src="http://labs.libre-entreprise.org//themes/le/images/logo.png" border="0" alt="" width="81" height="62" /></a></td>-->
- <td style="color: #FFFFFF; font-size: large; font-weight: bold;" valign="middle">Labs.libre-entreprise.org</td>
- <td>
- <form action="/search/" method="get">
- <table border="0" cellpadding="0" cellspacing="0">
- <tr><td>
- <div align="center" style="font-size:smaller"><select name="type_of_search"><option value="soft">Logiciel/Groupe</option>
-<option value="people">Personne</option>
-</select></div></td><td> </td><td><input type="text" size="12" name="words" value="" /></td><td> </td><td><input type="submit" name="Search" value="Rechercher" /></td></tr></table></form></td>
- <td align="right"> <b><a style="color: #FFFFFF" href="/account/logout.php">Se déconnecter</a></b><br />
- <b><a style="color: #FFFFFF" href="/account/">Mon compte</a></b>
- </td>
- <td> </td>
- </tr>
-
-</table>
-
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-
- <tr>
- <td> </td>
- <td colspan="3">
-
-
-
- <!-- start tabs -->
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td valign="top" width="10" background="/themes/le/images/theme-toptab-end-notselected.png"><img src="/themes/le/images/clear.png" height="25" width="10" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/">Accueil</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/my/">Ma page</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/softwaremap/">Arbre des projets</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/snippet/">Boite à outils</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-selected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-selected-bg.png" width="20%" align="center"><a class="tabsellink" href="/projects/isis-fish/">Isis-fish</a></td>
- <td valign="top" width="10" background="/themes/le/images/theme-toptab-selected-end.png"><img src="/themes/le/images/clear.png" height="2" width="10" alt="" /></td></tr><tr><td colspan="12" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="3" height="1" bgcolor="#e0e0e0"><img src="/themes/le/images/clear.png" height="1" width="10" /></td></tr>
- </table>
-
- <!-- end tabs -->
-
- </td>
- <td> </td>
- </tr>
-
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/topleft.png" height="9" width="9" alt="" /></td>
- <td bgcolor="#E0E0E0" width="30"><img src="/themes/le/images/clear.png" width="30" height="1" alt="" /></td>
- <td bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
- <td bgcolor="#E0E0E0" width="30"><img src="/themes/le/images/clear.png" width="30" height="1" alt="" /></td>
- <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/topright.png" height="9" width="9" alt="" /></td>
- </tr>
-
- <tr>
-
- <!-- Outer body row -->
-
- <td bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="10" height="1" alt="" /></td>
- <td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
-
- <!-- Inner Tabs / Shell -->
-
- <table border="0" width="100%" cellspacing="0" cellpadding="0">
- <tr>
- <td> </td>
- <td>
-
-
- <!-- start tabs -->
-
- <table border="0" cellpadding="0" cellspacing="0" width="100%">
- <tr>
- <td valign="top" width="10" background="/themes/le/images/theme-bottomtab-end-notselected.png"><img src="/themes/le/images/clear.png" height="25" width="10" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/projects/isis-fish/">En bref</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/tracker/?group_id=8">Suivi</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/mail/?group_id=8">Listes</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/pm/?group_id=8">Tâches</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/docman/?group_id=8">Documents</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/survey/?group_id=8">Sondages</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/news/?group_id=8">Annonces</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-selected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-selected-bg.png" width="10%" align="center"><a class="tabsellink" href="/scm/?group_id=8">Sources</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-selected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/frs/?group_id=8">Fichiers</a></td>
- <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/plugins/wiki/index.php?id=8&type=g">Wiki</a></td>
- <td valign="top" width="10" background="/themes/le/images/theme-bottomtab-notselected-end.png"><img src="/themes/le/images/clear.png" height="2" width="10" alt="" /></td></tr><tr><td colspan="21" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="3" height="1" bgcolor="white"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="6" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td></tr>
- </table>
-
- <!-- end tabs -->
- </td>
- <td> </td>
- </tr>
- <tr>
- <td align="left" bgcolor="#ffffff" width="9"><img src="/themes/le/images/tabs/topleft-inner.png" height="9" width="9" alt="" /></td>
- <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
- <td align="right" bgcolor="#ffffff" width="9"><img src="/themes/le/images/tabs/topright-inner.png" height="9" width="9" alt="" /></td>
- </tr>
-
- <tr>
- <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="10" height="1" alt="" /></td>
- <td valign="top" width="99%" bgcolor="white">
-
- <link href="/plugins/scmsvn/styles.css" rel="stylesheet" TYPE="text/css">
-IHDR óÿagAMA¯È7étEXtSoftwareAdobe ImageReadyqÉe< IDAT8ËOHÓaÇ?ïï÷[K¡£@ B©m* j!TA§ §°Ö¥ŒW$A·èÐ¥Ón ÀXA"9t+"Qå
msÄþŒïût xyx x>ï÷}þ "ìåäFFd§žÃ íÕÄÄq%"L&#ÆŽÖlx5ù|T*E0$
-ÅÔF·V¯×éëë`+XDF£Édrm5³ËcÁÅžxBSVwÔj5Dp× œÒÙ¬XŽm(Ь® i*JsÀîß»Ž³£¹jµ0÷£#¶`M£b
«§ëÍMaìhþ¿×?|cúÅ<¥Ö× /Êkf .ÞßÜMOöì ø¹$±ÖH$p ¥ë-9Z{þrnì,G:û]zÙþòþÞp<ØDkm¯ãsÉ?#"xG8 &Ó+ Ä8Áîqª3|ràŠp;uœ £Þ ô âmö5ÖZ<ÏÃó< Çaǧ;~ ;:<à÷6F[Y)/«ýµvÙ¬Ïâº.J)
-¥5VX\gjü9Óo&ð»-%"Äãqi¶H?ùÛct`þ®S¬üúȧy²ß·-S3§@°<M?YúOpYíËIEND®B` <!-- end main body row -->
-
-
- </td>
- <td width="10" bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="2" height="1" alt="" /></td>
- </tr>
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomleft-inner.png" height="11" width="11" alt="" /></td>
- <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
- <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomright-inner.png" height="11" width="11" alt="" /></td>
- </tr>
- </table>
-
- <!-- end inner body row -->
-
- </td>
- <td width="10" bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="2" height="1" alt="" /></td>
- </tr>
- <tr>
- <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomleft.png" height="9" width="9" alt="" /></td>
- <td bgcolor="#E0E0E0" colspan="3"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
- <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomright.png" height="9" width="9" alt="" /></td>
- </tr>
-</table>
-
-<!-- PLEASE LEAVE "Powered By GForge" on your site -->
-<br />
-<center>
-<a href="http://gforge.org/"><img src="/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0" /></a>
-</center>
-
-
-</body>
-</html>
+PNG
+
+
+IHDR
+sRGB®Î ébKGDÿÿÿ œ§ pHYs tIMEÙ
+2þ¥ºÏIDAT8˵MLcUßsîé¹mo§¿¥ÒÄ, 2ðãÆH ÉàÖ°Y`\3êšvÆâºÐ h !)VK[~ú{{霧çÞãLÙø&ßâ;çËsòŸ ÁZZZbÉd2
+B DZÊårevvVâ)"O6+++Z2|3 ¿î÷û)¥(¥,Û¶wÍæwÅbñ ï©Àœœœ[@àãP(ô*¥ôÊaÏó`æeœ?<<üË¿wvv¢J©¡Pè&!ü×<ÏSŠinZ55::Úøç=\.7×ÕÕõÏ "¥ )Js[[[f³ÙËÀb±Ø£Ïçc 1pΡiÀu]! ¥BËåÞL&CšK@˲ÈÁÁcÅbÇãÐuýšã8šV«šÕj¡ÚÚÚÚ¥çSSÇÇÇ°mº®C×uø|Ÿb];ÂA±|þáø`ã=íJ`>§ããã
BÐ4
+<éÍã^J#ìcÿæWøÚ{ç^ïwÿJSJ¥8çÁ`RHycJ)Á }·ÞaèX¥¿ê?áûËÀññqµŒŒx<T*
ÃÃCt: ض
+J) Ãç JÅf ×P Ëùf°œœM&''±¿¿zœÎ9h6ðàÂìÔÁý:
+ÇTqAG5Ãô3ôyìbENY2$Rär9 ^žêº. ÇÁzu?ºÃ(°ç0ñ2ÀÎp=ÔŒ{g0~PÀBÉ0J) š®®®b}} ©T
+®ë¢Ñh P( šÿ§^A"êyЪIžÊF&Ù )Ó°¥Óé æ5- !Äéôôôóšçy`A)
V«Žáêðw®×ÐÂ' Ÿ:.
+JÒÓògBý^¶H,C8 ÌÏÏ¿ÍfßUJ
+(¥À9mÛh6Úò fËD.÷kÛíŸ;{ºaþöguñÛMqßSç;.ÜNÕj5ÔjµöÂÂÂLfefff1vûää$uttä×4
+ÝÝÝN$)ÕÍÃ?7z{® ºr4ù°Ož®kÕëuqVo»üwž ×uw?êïïO$T«ÕBšiæîî®<==Mô§É€AÂ@`µ4ÛÒóG\gT:ö1Æ"¡)÷
×Èç6ÄÃÊŸuÏóªù|ÞÆÿ¡¿lÑA9ПIEND®B`
\ No newline at end of file
1
0
07 May '09
Author: chatellier
Date: 2009-05-07 18:57:06 +0000 (Thu, 07 May 2009)
New Revision: 2205
Modified:
isis-fish/trunk/src/main/resources/log4j.properties
Log:
Fix log level
Modified: isis-fish/trunk/src/main/resources/log4j.properties
===================================================================
--- isis-fish/trunk/src/main/resources/log4j.properties 2009-05-07 18:34:48 UTC (rev 2204)
+++ isis-fish/trunk/src/main/resources/log4j.properties 2009-05-07 18:57:06 UTC (rev 2205)
@@ -6,9 +6,9 @@
log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n
# package level
-log4j.logger.fr.ifremer.isisfish.ui=DEBUG
+log4j.logger.fr.ifremer.isisfish.ui=INFO
log4j.logger.org.codelutin=INFO
-log4j.logger.jaxx.runtime=DEBUG
+log4j.logger.jaxx.runtime=INFO
log4j.logger.analyseplans=INFO
log4j.logger.exports=INFO
log4j.logger.formules=INFO
1
0
r2204 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 07 May '09
by chatellier＠users.labs.libre-entreprise.org 07 May '09
07 May '09
Author: chatellier
Date: 2009-05-07 18:34:48 +0000 (Thu, 07 May 2009)
New Revision: 2204
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java
Log:
Reenable second pass
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-07 17:57:22 UTC (rev 2203)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-07 18:34:48 UTC (rev 2204)
@@ -497,11 +497,9 @@
// sensitivity calculator analyze result call
// can't do analyze second pass if simulation
// has been deleted
- /*
- too slow to do it here
if (simulationAvailble) {
analyzeSensitivityResult(job, simulation);
- }*/
+ }
}
// notify simulation ended
1
0
r2203 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 07 May '09
by chatellier＠users.labs.libre-entreprise.org 07 May '09
07 May '09
Author: chatellier
Date: 2009-05-07 17:57:22 +0000 (Thu, 07 May 2009)
New Revision: 2203
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java
Log:
Fix loop
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-07 17:54:24 UTC (rev 2202)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-07 17:57:22 UTC (rev 2203)
@@ -635,7 +635,7 @@
// simulation start at 0
List<SimulationStorage> simulationStorageForAnalyze = new ArrayList<SimulationStorage>();
// en sens inverse, il le fera carrement moins souvent
- for (int simulationIndex = 0; simulationIndex < numberOfSimulation ; --simulationIndex) {
+ for (int simulationIndex = 0; simulationIndex < numberOfSimulation ; simulationIndex++) {
String currentId = simulationCommonPrefix + "_" + simulationIndex;
if (SimulationStorage.localyExists(currentId)) {
SimulationControl currentSimulationControl = new SimulationControl(currentId);
1
0
r2202 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 07 May '09
by chatellier＠users.labs.libre-entreprise.org 07 May '09
07 May '09
Author: chatellier
Date: 2009-05-07 17:54:24 +0000 (Thu, 07 May 2009)
New Revision: 2202
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java
Log:
Too slow to do 2dn pass at each simulation end
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-07 17:08:43 UTC (rev 2201)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2009-05-07 17:54:24 UTC (rev 2202)
@@ -497,9 +497,11 @@
// sensitivity calculator analyze result call
// can't do analyze second pass if simulation
// has been deleted
+ /*
+ too slow to do it here
if (simulationAvailble) {
analyzeSensitivityResult(job, simulation);
- }
+ }*/
}
// notify simulation ended
@@ -633,7 +635,7 @@
// simulation start at 0
List<SimulationStorage> simulationStorageForAnalyze = new ArrayList<SimulationStorage>();
// en sens inverse, il le fera carrement moins souvent
- for (int simulationIndex = numberOfSimulation -1; simulationIndex >= 0 ; --simulationIndex) {
+ for (int simulationIndex = 0; simulationIndex < numberOfSimulation ; --simulationIndex) {
String currentId = simulationCommonPrefix + "_" + simulationIndex;
if (SimulationStorage.localyExists(currentId)) {
SimulationControl currentSimulationControl = new SimulationControl(currentId);
1
0
r2201 - isis-fish/trunk/src/main/resources/icons
by sletellier＠users.labs.libre-entreprise.org 07 May '09
by sletellier＠users.labs.libre-entreprise.org 07 May '09
07 May '09
Author: sletellier
Date: 2009-05-07 17:08:43 +0000 (Thu, 07 May 2009)
New Revision: 2201
Added:
isis-fish/trunk/src/main/resources/icons/building.png
isis-fish/trunk/src/main/resources/icons/building_add.png
Log:
Oups ! Adding removed icons
Added: isis-fish/trunk/src/main/resources/icons/building.png
===================================================================
--- isis-fish/trunk/src/main/resources/icons/building.png (rev 0)
+++ isis-fish/trunk/src/main/resources/icons/building.png 2009-05-07 17:08:43 UTC (rev 2201)
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="fr ">
+
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Labs: Isis-fish: dépÎt de sources</title>
+ <link rel="alternate" title="Labs - Project News Highlights RSS" href="/export/rss_sfnews.php" type="application/rss+xml"/>
+ <link rel="alternate" title="Labs - New Projects RSS" href="/export/rss_sfprojects.php" type="application/rss+xml"/>
+
+ <script language="JavaScript" type="text/javascript">
+ <!--
+
+ function admin_window(adminurl) {
+ AdminWin = window.open( adminurl, 'AdminWindow','scrollbars=yes,resizable=yes, toolbar=yes, height=400, width=400, top=2, left=2');
+ AdminWin.focus();
+ }
+ function help_window(helpurl) {
+ HelpWin = window.open( helpurl,'HelpWindow','scrollbars=yes,resizable=yes,toolbar=no,height=400,width=400');
+ }
+ // -->
+ </script>
+
+<style type="text/css">
+ <!--
+ BODY {
+ margin-top: 3;
+ margin-left: 3;
+ margin-right: 3;
+ margin-bottom: 3;
+ background-image: url("/themes/le/images/theme-top-blue.png");
+ }
+ ol,ul,p,body,td,tr,th,form { font-family: verdana,arial,helvetica,sans-serif; font-size:small;
+ color: #333333; }
+
+ h1 { font-size: x-large; font-family: verdana,arial,helvetica,sans-serif; }
+ h2 { font-size: large; font-family: verdana,arial,helvetica,sans-serif; }
+ h3 { font-size: medium; font-family: verdana,arial,helvetica,sans-serif; }
+ h4 { font-size: small; font-family: verdana,arial,helvetica,sans-serif; }
+ h5 { font-size: x-small; font-family: verdana,arial,helvetica,sans-serif; }
+ h6 { font-size: xx-small; font-family: verdana,arial,helvetica,sans-serif; }
+
+ pre,tt { font-family: courier,sans-serif }
+
+ a:link { text-decoration:none; color: #0000be }
+ a:visited { text-decoration:none; color: #0000be }
+ a:active { text-decoration:none }
+ a:hover { text-decoration:underline; color:red }
+
+ .titlebar { color: black; text-decoration: none; font-weight: bold; }
+ a.tablink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
+ a.tablink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
+ a.tablink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
+ a.tabsellink { color: #0000be; text-decoration: none; font-weight: bold; font-size: x-small; }
+ a.tabsellink:visited { color: #0000be; text-decoration: none; font-weight: bold; font-size: x-small; }
+ a.tabsellink:hover { text-decoration: none; color: #0000be; font-weight: bold; font-size: x-small; }
+ -->
+</style>
+<link rel="stylesheet" type="text/css" href="/plugins/scmcvs/cvsweb/css/cvsweb.css" /><link rel="stylesheet" type="text/css" href="/plugins/scmsvn/viewcvs/styles.css" /></head>
+
+<body>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
+
+ <tr>
+ <!--<td><a href="/"><img src="http://labs.libre-entreprise.org//themes/le/images/logo.png" border="0" alt="" width="81" height="62" /></a></td>-->
+ <td style="color: #FFFFFF; font-size: large; font-weight: bold;" valign="middle">Labs.libre-entreprise.org</td>
+ <td>
+ <form action="/search/" method="get">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr><td>
+ <div align="center" style="font-size:smaller"><select name="type_of_search"><option value="soft">Logiciel/Groupe</option>
+<option value="people">Personne</option>
+</select></div></td><td> </td><td><input type="text" size="12" name="words" value="" /></td><td> </td><td><input type="submit" name="Search" value="Rechercher" /></td></tr></table></form></td>
+ <td align="right"> <b><a style="color: #FFFFFF" href="/account/logout.php">Se déconnecter</a></b><br />
+ <b><a style="color: #FFFFFF" href="/account/">Mon compte</a></b>
+ </td>
+ <td> </td>
+ </tr>
+
+</table>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
+
+ <tr>
+ <td> </td>
+ <td colspan="3">
+
+
+
+ <!-- start tabs -->
+
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td valign="top" width="10" background="/themes/le/images/theme-toptab-end-notselected.png"><img src="/themes/le/images/clear.png" height="25" width="10" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/">Accueil</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/my/">Ma page</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/softwaremap/">Arbre des projets</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/snippet/">Boite à outils</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-selected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-selected-bg.png" width="20%" align="center"><a class="tabsellink" href="/projects/isis-fish/">Isis-fish</a></td>
+ <td valign="top" width="10" background="/themes/le/images/theme-toptab-selected-end.png"><img src="/themes/le/images/clear.png" height="2" width="10" alt="" /></td></tr><tr><td colspan="12" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="3" height="1" bgcolor="#e0e0e0"><img src="/themes/le/images/clear.png" height="1" width="10" /></td></tr>
+ </table>
+
+ <!-- end tabs -->
+
+ </td>
+ <td> </td>
+ </tr>
+
+ <tr>
+ <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/topleft.png" height="9" width="9" alt="" /></td>
+ <td bgcolor="#E0E0E0" width="30"><img src="/themes/le/images/clear.png" width="30" height="1" alt="" /></td>
+ <td bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
+ <td bgcolor="#E0E0E0" width="30"><img src="/themes/le/images/clear.png" width="30" height="1" alt="" /></td>
+ <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/topright.png" height="9" width="9" alt="" /></td>
+ </tr>
+
+ <tr>
+
+ <!-- Outer body row -->
+
+ <td bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="10" height="1" alt="" /></td>
+ <td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
+
+ <!-- Inner Tabs / Shell -->
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+ <td> </td>
+ <td>
+
+
+ <!-- start tabs -->
+
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td valign="top" width="10" background="/themes/le/images/theme-bottomtab-end-notselected.png"><img src="/themes/le/images/clear.png" height="25" width="10" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/projects/isis-fish/">En bref</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/tracker/?group_id=8">Suivi</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/mail/?group_id=8">Listes</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/pm/?group_id=8">Tâches</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/docman/?group_id=8">Documents</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/survey/?group_id=8">Sondages</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/news/?group_id=8">Annonces</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-selected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-selected-bg.png" width="10%" align="center"><a class="tabsellink" href="/scm/?group_id=8">Sources</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-selected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/frs/?group_id=8">Fichiers</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/plugins/wiki/index.php?id=8&type=g">Wiki</a></td>
+ <td valign="top" width="10" background="/themes/le/images/theme-bottomtab-notselected-end.png"><img src="/themes/le/images/clear.png" height="2" width="10" alt="" /></td></tr><tr><td colspan="21" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="3" height="1" bgcolor="white"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="6" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td></tr>
+ </table>
+
+ <!-- end tabs -->
+ </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="left" bgcolor="#ffffff" width="9"><img src="/themes/le/images/tabs/topleft-inner.png" height="9" width="9" alt="" /></td>
+ <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
+ <td align="right" bgcolor="#ffffff" width="9"><img src="/themes/le/images/tabs/topright-inner.png" height="9" width="9" alt="" /></td>
+ </tr>
+
+ <tr>
+ <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="10" height="1" alt="" /></td>
+ <td valign="top" width="99%" bgcolor="white">
+
+ <link href="/plugins/scmsvn/styles.css" rel="stylesheet" TYPE="text/css">
+IHDR óÿagAMA¯È7étEXtSoftwareAdobe ImageReadyqÉe<ŸIDAT8ËMKQßÇ¢L¢€°t¡µZ¹
+lÓºUž
+ú-
+ZŽížj$mÚŽ)!Jh1Ù:ãýhî¥!éÀá îÜó÷¹sôãÏÑ(¢O;ÙÜ잯JËòù<§Ö*\×ud³Yøý~B!Äãq¥£ýŠ5
+Aÿ8É5ÉØØ¢°B³3j1(g"`yÀ0îÓ4eðX¹ã ¡þ¹Ò°¬JXS±ª3Æ#š×ëœÂÆ_ºüÎáÞ
+ÄGqðòÁkõÏ¥F³àùFoú.z^|ñÏÎ\rÊ5äÁ
+_µúeH¥RPU¢È5H bŒãqŒhŽo¢4: ÈWne5MÓDd, åZ®Ö×míìÖ šr>âôá¬Eð©bÿj_Ä€K±Ù64Lßé|¿V¹9s28 6$}VwáíãE\8?%l·=zìÙÃò*(
+žòJÅ_¯2ק2&ÌÛmzâ ÓìJð9î4 IEND®B` <!-- end main body row -->
+
+
+ </td>
+ <td width="10" bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="2" height="1" alt="" /></td>
+ </tr>
+ <tr>
+ <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomleft-inner.png" height="11" width="11" alt="" /></td>
+ <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
+ <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomright-inner.png" height="11" width="11" alt="" /></td>
+ </tr>
+ </table>
+
+ <!-- end inner body row -->
+
+ </td>
+ <td width="10" bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="2" height="1" alt="" /></td>
+ </tr>
+ <tr>
+ <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomleft.png" height="9" width="9" alt="" /></td>
+ <td bgcolor="#E0E0E0" colspan="3"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
+ <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomright.png" height="9" width="9" alt="" /></td>
+ </tr>
+</table>
+
+<!-- PLEASE LEAVE "Powered By GForge" on your site -->
+<br />
+<center>
+<a href="http://gforge.org/"><img src="/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0" /></a>
+</center>
+
+
+</body>
+</html>
Added: isis-fish/trunk/src/main/resources/icons/building_add.png
===================================================================
--- isis-fish/trunk/src/main/resources/icons/building_add.png (rev 0)
+++ isis-fish/trunk/src/main/resources/icons/building_add.png 2009-05-07 17:08:43 UTC (rev 2201)
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="fr ">
+
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <title>Labs: Isis-fish: dépÎt de sources</title>
+ <link rel="alternate" title="Labs - Project News Highlights RSS" href="/export/rss_sfnews.php" type="application/rss+xml"/>
+ <link rel="alternate" title="Labs - New Projects RSS" href="/export/rss_sfprojects.php" type="application/rss+xml"/>
+
+ <script language="JavaScript" type="text/javascript">
+ <!--
+
+ function admin_window(adminurl) {
+ AdminWin = window.open( adminurl, 'AdminWindow','scrollbars=yes,resizable=yes, toolbar=yes, height=400, width=400, top=2, left=2');
+ AdminWin.focus();
+ }
+ function help_window(helpurl) {
+ HelpWin = window.open( helpurl,'HelpWindow','scrollbars=yes,resizable=yes,toolbar=no,height=400,width=400');
+ }
+ // -->
+ </script>
+
+<style type="text/css">
+ <!--
+ BODY {
+ margin-top: 3;
+ margin-left: 3;
+ margin-right: 3;
+ margin-bottom: 3;
+ background-image: url("/themes/le/images/theme-top-blue.png");
+ }
+ ol,ul,p,body,td,tr,th,form { font-family: verdana,arial,helvetica,sans-serif; font-size:small;
+ color: #333333; }
+
+ h1 { font-size: x-large; font-family: verdana,arial,helvetica,sans-serif; }
+ h2 { font-size: large; font-family: verdana,arial,helvetica,sans-serif; }
+ h3 { font-size: medium; font-family: verdana,arial,helvetica,sans-serif; }
+ h4 { font-size: small; font-family: verdana,arial,helvetica,sans-serif; }
+ h5 { font-size: x-small; font-family: verdana,arial,helvetica,sans-serif; }
+ h6 { font-size: xx-small; font-family: verdana,arial,helvetica,sans-serif; }
+
+ pre,tt { font-family: courier,sans-serif }
+
+ a:link { text-decoration:none; color: #0000be }
+ a:visited { text-decoration:none; color: #0000be }
+ a:active { text-decoration:none }
+ a:hover { text-decoration:underline; color:red }
+
+ .titlebar { color: black; text-decoration: none; font-weight: bold; }
+ a.tablink { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
+ a.tablink:visited { color: black; text-decoration: none; font-weight: bold; font-size: x-small; }
+ a.tablink:hover { text-decoration: none; color: black; font-weight: bold; font-size: x-small; }
+ a.tabsellink { color: #0000be; text-decoration: none; font-weight: bold; font-size: x-small; }
+ a.tabsellink:visited { color: #0000be; text-decoration: none; font-weight: bold; font-size: x-small; }
+ a.tabsellink:hover { text-decoration: none; color: #0000be; font-weight: bold; font-size: x-small; }
+ -->
+</style>
+<link rel="stylesheet" type="text/css" href="/plugins/scmcvs/cvsweb/css/cvsweb.css" /><link rel="stylesheet" type="text/css" href="/plugins/scmsvn/viewcvs/styles.css" /></head>
+
+<body>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
+
+ <tr>
+ <!--<td><a href="/"><img src="http://labs.libre-entreprise.org//themes/le/images/logo.png" border="0" alt="" width="81" height="62" /></a></td>-->
+ <td style="color: #FFFFFF; font-size: large; font-weight: bold;" valign="middle">Labs.libre-entreprise.org</td>
+ <td>
+ <form action="/search/" method="get">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr><td>
+ <div align="center" style="font-size:smaller"><select name="type_of_search"><option value="soft">Logiciel/Groupe</option>
+<option value="people">Personne</option>
+</select></div></td><td> </td><td><input type="text" size="12" name="words" value="" /></td><td> </td><td><input type="submit" name="Search" value="Rechercher" /></td></tr></table></form></td>
+ <td align="right"> <b><a style="color: #FFFFFF" href="/account/logout.php">Se déconnecter</a></b><br />
+ <b><a style="color: #FFFFFF" href="/account/">Mon compte</a></b>
+ </td>
+ <td> </td>
+ </tr>
+
+</table>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="0">
+
+ <tr>
+ <td> </td>
+ <td colspan="3">
+
+
+
+ <!-- start tabs -->
+
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td valign="top" width="10" background="/themes/le/images/theme-toptab-end-notselected.png"><img src="/themes/le/images/clear.png" height="25" width="10" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/">Accueil</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/my/">Ma page</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/softwaremap/">Arbre des projets</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-notselected-bg.png" width="20%" align="center"><a class="tablink" href="/snippet/">Boite à outils</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-toptab-notselected-selected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-toptab-selected-bg.png" width="20%" align="center"><a class="tabsellink" href="/projects/isis-fish/">Isis-fish</a></td>
+ <td valign="top" width="10" background="/themes/le/images/theme-toptab-selected-end.png"><img src="/themes/le/images/clear.png" height="2" width="10" alt="" /></td></tr><tr><td colspan="12" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="3" height="1" bgcolor="#e0e0e0"><img src="/themes/le/images/clear.png" height="1" width="10" /></td></tr>
+ </table>
+
+ <!-- end tabs -->
+
+ </td>
+ <td> </td>
+ </tr>
+
+ <tr>
+ <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/topleft.png" height="9" width="9" alt="" /></td>
+ <td bgcolor="#E0E0E0" width="30"><img src="/themes/le/images/clear.png" width="30" height="1" alt="" /></td>
+ <td bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
+ <td bgcolor="#E0E0E0" width="30"><img src="/themes/le/images/clear.png" width="30" height="1" alt="" /></td>
+ <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/topright.png" height="9" width="9" alt="" /></td>
+ </tr>
+
+ <tr>
+
+ <!-- Outer body row -->
+
+ <td bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="10" height="1" alt="" /></td>
+ <td valign="top" width="99%" bgcolor="#E0E0E0" colspan="3">
+
+ <!-- Inner Tabs / Shell -->
+
+ <table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+ <td> </td>
+ <td>
+
+
+ <!-- start tabs -->
+
+ <table border="0" cellpadding="0" cellspacing="0" width="100%">
+ <tr>
+ <td valign="top" width="10" background="/themes/le/images/theme-bottomtab-end-notselected.png"><img src="/themes/le/images/clear.png" height="25" width="10" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/projects/isis-fish/">En bref</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/tracker/?group_id=8">Suivi</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/mail/?group_id=8">Listes</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/pm/?group_id=8">Tâches</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/docman/?group_id=8">Documents</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/survey/?group_id=8">Sondages</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/news/?group_id=8">Annonces</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-selected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-selected-bg.png" width="10%" align="center"><a class="tabsellink" href="/scm/?group_id=8">Sources</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-selected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/frs/?group_id=8">Fichiers</a></td>
+ <td colspan="2" valign="top" width="20" background="/themes/le/images/theme-bottomtab-notselected-notselected.png"><img src="/themes/le/images/clear.png" height="2" width="20" alt="" /></td><td background="/themes/le/images/theme-bottomtab-notselected-bg.png" width="10%" align="center"><a class="tablink" href="/plugins/wiki/index.php?id=8&type=g">Wiki</a></td>
+ <td valign="top" width="10" background="/themes/le/images/theme-bottomtab-notselected-end.png"><img src="/themes/le/images/clear.png" height="2" width="10" alt="" /></td></tr><tr><td colspan="21" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="3" height="1" bgcolor="white"><img src="/themes/le/images/clear.png" height="1" width="10" /></td><td colspan="6" height="1" bgcolor="#909090"><img src="/themes/le/images/clear.png" height="1" width="10" /></td></tr>
+ </table>
+
+ <!-- end tabs -->
+ </td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="left" bgcolor="#ffffff" width="9"><img src="/themes/le/images/tabs/topleft-inner.png" height="9" width="9" alt="" /></td>
+ <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
+ <td align="right" bgcolor="#ffffff" width="9"><img src="/themes/le/images/tabs/topright-inner.png" height="9" width="9" alt="" /></td>
+ </tr>
+
+ <tr>
+ <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="10" height="1" alt="" /></td>
+ <td valign="top" width="99%" bgcolor="white">
+
+ <link href="/plugins/scmsvn/styles.css" rel="stylesheet" TYPE="text/css">
+IHDR óÿagAMA¯È7étEXtSoftwareAdobe ImageReadyqÉe< IDAT8ËOHÓaÇ?ïï÷[K¡£@ B©m* j!TA§ §°Ö¥ŒW$A·èÐ¥Ón ÀXA"9t+"Qå
msÄþŒïût xyx x>ï÷}þ "ìåäFFd§žÃ íÕÄÄq%"L&#ÆŽÖlx5ù|T*E0$
+ÅÔF·V¯×éëë`+XDF£Édrm5³ËcÁÅžxBSVwÔj5Dp× œÒÙ¬XŽm(Ь® i*JsÀîß»Ž³£¹jµ0÷£#¶`M£b
«§ëÍMaìhþ¿×?|cúÅ<¥Ö× /Êkf .ÞßÜMOöì ø¹$±ÖH$p ¥ë-9Z{þrnì,G:û]zÙþòþÞp<ØDkm¯ãsÉ?#"xG8 &Ó+ Ä8Áîqª3|ràŠp;uœ £Þ ô âmö5ÖZ<ÏÃó< Çaǧ;~ ;:<à÷6F[Y)/«ýµvÙ¬Ïâº.J)
+¥5VX\gjü9Óo&ð»-%"Äãqi¶H?ùÛct`þ®S¬üúȧy²ß·-S3§@°<M?YúOpYíËIEND®B` <!-- end main body row -->
+
+
+ </td>
+ <td width="10" bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="2" height="1" alt="" /></td>
+ </tr>
+ <tr>
+ <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomleft-inner.png" height="11" width="11" alt="" /></td>
+ <td bgcolor="#ffffff"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
+ <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomright-inner.png" height="11" width="11" alt="" /></td>
+ </tr>
+ </table>
+
+ <!-- end inner body row -->
+
+ </td>
+ <td width="10" bgcolor="#E0E0E0"><img src="/themes/le/images/clear.png" width="2" height="1" alt="" /></td>
+ </tr>
+ <tr>
+ <td align="left" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomleft.png" height="9" width="9" alt="" /></td>
+ <td bgcolor="#E0E0E0" colspan="3"><img src="/themes/le/images/clear.png" width="1" height="1" alt="" /></td>
+ <td align="right" bgcolor="#E0E0E0" width="9"><img src="/themes/le/images/tabs/bottomright.png" height="9" width="9" alt="" /></td>
+ </tr>
+</table>
+
+<!-- PLEASE LEAVE "Powered By GForge" on your site -->
+<br />
+<center>
+<a href="http://gforge.org/"><img src="/images/pow-gforge.png" alt="Powered By GForge Collaborative Development Environment" border="0" /></a>
+</center>
+
+
+</body>
+</html>
1
0
r2200 - in isis-fish/trunk: . src/main/java/fr/ifremer/isisfish/entities src/main/java/fr/ifremer/isisfish/ui/input src/main/java/fr/ifremer/isisfish/ui/result src/main/java/fr/ifremer/isisfish/ui/script src/main/java/fr/ifremer/isisfish/ui/sensitivity src/main/java/fr/ifremer/isisfish/ui/simulator src/main/java/fr/ifremer/isisfish/ui/util src/main/java/fr/ifremer/isisfish/ui/widget src/main/resources src/main/resources/icons
by sletellier＠users.labs.libre-entreprise.org 07 May '09
by sletellier＠users.labs.libre-entreprise.org 07 May '09
07 May '09
Author: sletellier
Date: 2009-05-07 17:03:19 +0000 (Thu, 07 May 2009)
New Revision: 2200
Removed:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/ErrorDialogUI.jaxx
isis-fish/trunk/src/main/resources/icons/building.png
isis-fish/trunk/src/main/resources/icons/building_add.png
Modified:
isis-fish/trunk/pom.xml
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java
isis-fish/trunk/src/main/resources/log4j.properties
Log:
Using jaxx-runtime-swing-widget (jaxx 0.5)
Modified: isis-fish/trunk/pom.xml
===================================================================
--- isis-fish/trunk/pom.xml 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/pom.xml 2009-05-07 17:03:19 UTC (rev 2200)
@@ -70,6 +70,13 @@
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.codelutin.jaxx</groupId>
+ <artifactId>jaxx-runtime-swing-widget</artifactId>
+ <version>${jaxx.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
<!-- Utilisé dans les scripts -->
<dependency>
<groupId>org.codelutin</groupId>
@@ -344,7 +351,7 @@
<labs.project>isis-fish</labs.project>
<!-- Custom version -->
- <jaxx.version>1.3</jaxx.version>
+ <jaxx.version>1.5</jaxx.version>
<topia.version>2.1.4</topia.version>
<topia.service.version>1.0.2</topia.service.version>
<lutinmatrix.version>1.3</lutinmatrix.version>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -481,7 +481,7 @@
double ancienne_val = mat.getValue(x, x) - coef;
mat.setValue(x, x, ancienne_val);
if (ancienne_val < 0) {
- /*#java.util.logging.Logger.getLogger("fr.ifremer.db.InfoSaisonPop.getMatriceMigration").info("Erreur dans la migration, un coef est negatif");#*/
+ log.info("Erreur dans la migration, un coef est negatif");
}
mat.setValue(x, y, coef);
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -31,6 +31,7 @@
import fr.ifremer.isisfish.entities.SetOfVessels;
import fr.ifremer.isisfish.entities.Metier;
import fr.ifremer.isisfish.types.TimeUnit;
+import jaxx.runtime.swing.editor.NumberEditor;
import jaxx.runtime.swing.Item;
@@ -39,17 +40,17 @@
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
//jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
- fieldEffortDescriptionFishingOperation.setText("");
+ fieldEffortDescriptionFishingOperation.setModelText("");
fieldEffortDescriptionFishingOperationDuration.setText("");
- fieldEffortDescriptionGearsNumberPerOperation.setText("");
- fieldEffortDescriptionCrewSize.setText("");
- fieldEffortDescriptionUnitCostOfFishing.setText("");
- fieldEffortDescriptionFixedCrewSalary.setText("");
- fieldEffortDescriptionCrewFoodCost.setText("");
- fieldEffortDescriptionCrewShareRate.setText("");
- fieldEffortDescriptionRepairAndMaintenanceGearCost.setText("");
- fieldEffortDescriptionLandingCosts.setText("");
- fieldEffortDescriptionOtherRunningCost.setText("");
+ fieldEffortDescriptionGearsNumberPerOperation.setModelText("");
+ fieldEffortDescriptionCrewSize.setModelText("");
+ fieldEffortDescriptionUnitCostOfFishing.setModelText("");
+ fieldEffortDescriptionFixedCrewSalary.setModelText("");
+ fieldEffortDescriptionCrewFoodCost.setModelText("");
+ fieldEffortDescriptionCrewShareRate.setModelText("");
+ fieldEffortDescriptionRepairAndMaintenanceGearCost.setModelText("");
+ fieldEffortDescriptionLandingCosts.setModelText("");
+ fieldEffortDescriptionOtherRunningCost.setModelText("");
}
if (evt.getNewValue() != null) {
// add binding on getBean()
@@ -99,6 +100,18 @@
EffortDescriptionImpl selectedEffort = (EffortDescriptionImpl)fieldEffortDescriptionEffortDescriptionList.getSelectedValue();
setEffortDescription(selectedEffort);
getVerifier().addCurrentEntity(getEffortDescription());
+ if (getEffortDescription() != null){
+ fieldEffortDescriptionFishingOperation.init();
+ fieldEffortDescriptionGearsNumberPerOperation.init();
+ fieldEffortDescriptionCrewSize.init();
+ fieldEffortDescriptionUnitCostOfFishing.init();
+ fieldEffortDescriptionFixedCrewSalary.init();
+ fieldEffortDescriptionCrewFoodCost.init();
+ fieldEffortDescriptionCrewShareRate.init();
+ fieldEffortDescriptionRepairAndMaintenanceGearCost.init();
+ fieldEffortDescriptionLandingCosts.init();
+ fieldEffortDescriptionOtherRunningCost.init();
+ }
}
]]>
</script>
@@ -134,7 +147,13 @@
<JLabel text="isisfish.effortDescription.fishingOperation" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}' onFocusLost='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/>
+ <NumberEditor id='fieldEffortDescriptionFishingOperation' constructorParams='this'
+ bean='{getEffortDescription()}' property='fishingOperation'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/>
+ <!--JTextField id="fieldEffortDescriptionFishingOperation" text='{getEffortDescription().getFishingOperation()}'
+ onFocusLost='getEffortDescription().setFishingOperation(Integer.parseInt(fieldEffortDescriptionFishingOperation.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperation"'/-->
</cell>
</row>
<row>
@@ -142,7 +161,10 @@
<JLabel text="isisfish.effortDescription.fishingOperationDuration" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionFishingOperationDuration" text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}' toolTipText="in hour" onFocusLost='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperationDuration"'/>
+ <JTextField id="fieldEffortDescriptionFishingOperationDuration"
+ text='{getEffortDescription().getFishingOperationDuration() == null ? "" : getEffortDescription().getFishingOperationDuration().getHour()}'
+ toolTipText="in hour" onFocusLost='getEffortDescription().setFishingOperationDuration(new TimeUnit(3600 * Double.parseDouble(fieldEffortDescriptionFishingOperationDuration.getText())))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FishingOperationDuration"'/>
</cell>
</row>
<row>
@@ -150,7 +172,13 @@
<JLabel text="isisfish.effortDescription.gearsNumberPerOperation" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}' onFocusLost='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/>
+ <NumberEditor id='fieldEffortDescriptionGearsNumberPerOperation' constructorParams='this'
+ bean='{getEffortDescription()}' property='gearsNumberPerOperation'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/>
+ <!--JTextField id="fieldEffortDescriptionGearsNumberPerOperation" text='{getEffortDescription().getGearsNumberPerOperation()}'
+ onFocusLost='getEffortDescription().setGearsNumberPerOperation(Integer.parseInt(fieldEffortDescriptionGearsNumberPerOperation.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"GearsNumberPerOperation"'/-->
</cell>
</row>
<row>
@@ -158,7 +186,13 @@
<JLabel text="isisfish.effortDescription.crewSize" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}' onFocusLost='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/>
+ <NumberEditor id='fieldEffortDescriptionCrewSize' constructorParams='this'
+ bean='{getEffortDescription()}' property='crewSize'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/>
+ <!--JTextField id="fieldEffortDescriptionCrewSize" text='{getEffortDescription().getCrewSize()}'
+ onFocusLost='getEffortDescription().setCrewSize(Integer.parseInt(fieldEffortDescriptionCrewSize.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewSize"'/-->
</cell>
</row>
<row>
@@ -166,7 +200,13 @@
<JLabel text="isisfish.effortDescription.unitCostOfFishing" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}' onFocusLost='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/>
+ <NumberEditor id='fieldEffortDescriptionUnitCostOfFishing' constructorParams='this'
+ bean='{getEffortDescription()}' property='unitCostOfFishing'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/>
+ <!--JTextField id="fieldEffortDescriptionUnitCostOfFishing" text='{getEffortDescription().getUnitCostOfFishing()}'
+ onFocusLost='getEffortDescription().setUnitCostOfFishing(Double.parseDouble(fieldEffortDescriptionUnitCostOfFishing.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"UnitCostOfFishing"'/-->
</cell>
</row>
<row>
@@ -174,7 +214,13 @@
<JLabel text="isisfish.effortDescription.fixedCrewSalary" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}' onFocusLost='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/>
+ <NumberEditor id='fieldEffortDescriptionFixedCrewSalary' constructorParams='this'
+ bean='{getEffortDescription()}' property='fixedCrewSalary'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/>
+ <!--JTextField id="fieldEffortDescriptionFixedCrewSalary" text='{getEffortDescription().getFixedCrewSalary()}'
+ onFocusLost='getEffortDescription().setFixedCrewSalary(Double.parseDouble(fieldEffortDescriptionFixedCrewSalary.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"FixedCrewSalary"'/-->
</cell>
</row>
<row>
@@ -182,7 +228,13 @@
<JLabel text="isisfish.effortDescription.crewFoodCost" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}' onFocusLost='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/>
+ <NumberEditor id='fieldEffortDescriptionCrewFoodCost' constructorParams='this'
+ bean='{getEffortDescription()}' property='crewFoodCost'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/>
+ <!--JTextField id="fieldEffortDescriptionCrewFoodCost" text='{getEffortDescription().getCrewFoodCost()}'
+ onFocusLost='getEffortDescription().setCrewFoodCost(Double.parseDouble(fieldEffortDescriptionCrewFoodCost.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewFoodCost"'/-->
</cell>
</row>
<row>
@@ -190,7 +242,13 @@
<JLabel text="isisfish.effortDescription.crewShareRate" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}' onFocusLost='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/>
+ <NumberEditor id='fieldEffortDescriptionCrewShareRate' constructorParams='this'
+ bean='{getEffortDescription()}' property='crewShareRate'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/>
+ <!--JTextField id="fieldEffortDescriptionCrewShareRate" text='{getEffortDescription().getCrewShareRate()}'
+ onFocusLost='getEffortDescription().setCrewShareRate(Double.parseDouble(fieldEffortDescriptionCrewShareRate.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"CrewShareRate"'/-->
</cell>
</row>
<row>
@@ -198,7 +256,13 @@
<JLabel text="isisfish.effortDescription.repairAndMaintenanceGearCost" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}' onFocusLost='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/>
+ <NumberEditor id='fieldEffortDescriptionRepairAndMaintenanceGearCost' constructorParams='this'
+ bean='{getEffortDescription()}' property='repairAndMaintenanceGearCost'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}'
+ _method='"RepairAndMaintenanceGearCost"' useSign='true'/>
+ <!--JTextField id="fieldEffortDescriptionRepairAndMaintenanceGearCost" text='{getEffortDescription().getRepairAndMaintenanceGearCost()}'
+ onFocusLost='getEffortDescription().setRepairAndMaintenanceGearCost(Double.parseDouble(fieldEffortDescriptionRepairAndMaintenanceGearCost.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"RepairAndMaintenanceGearCost"'/-->
</cell>
</row>
<row>
@@ -206,7 +270,13 @@
<JLabel text="isisfish.effortDescription.landingCosts" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}' onFocusLost='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/>
+ <NumberEditor id='fieldEffortDescriptionLandingCosts' constructorParams='this'
+ bean='{getEffortDescription()}' property='landingCosts'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/>
+ <!--JTextField id="fieldEffortDescriptionLandingCosts" text='{getEffortDescription().getLandingCosts()}'
+ onFocusLost='getEffortDescription().setLandingCosts(Double.parseDouble(fieldEffortDescriptionLandingCosts.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"LandingCosts"'/-->
</cell>
</row>
<row>
@@ -214,7 +284,13 @@
<JLabel text="isisfish.effortDescription.otherRunningCost" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}' onFocusLost='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/>
+ <NumberEditor id='fieldEffortDescriptionOtherRunningCost' constructorParams='this'
+ bean='{getEffortDescription()}' property='otherRunningCost'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/>
+ <!--JTextField id="fieldEffortDescriptionOtherRunningCost" text='{getEffortDescription().getOtherRunningCost()}'
+ onFocusLost='getEffortDescription().setOtherRunningCost(Double.parseDouble(fieldEffortDescriptionOtherRunningCost.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{EffortDescriptionImpl.class}' _method='"OtherRunningCost"'/-->
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -44,6 +44,7 @@
import fr.ifremer.isisfish.map.CellSelectionLayer;
import com.bbn.openmap.event.SelectMouseMode;
import fr.ifremer.isisfish.entities.FisheryRegionImpl;
+import jaxx.runtime.swing.editor.NumberEditor;
protected OMToolSet toolSet = new OMToolSet();
@@ -71,6 +72,12 @@
setBean((FisheryRegionImpl)region);
if (region != null){
setFieldMapfilesModel(getBean());
+ fieldLatMin.init();
+ fieldLatMax.init();
+ fieldLongMin.init();
+ fieldLongMax.init();
+ fieldCellLengthLatitude.init();
+ fieldCellLengthLongitude.init();
}
}
protected void setFieldMapfilesModel(FisheryRegion region){
@@ -148,8 +155,9 @@
<JLabel text="isisfish.fisheryRegion.latitude.min"/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldLatMin" text='{getBean().getMinLatitude()}' decorator='boxed'
- onKeyReleased='getBean().setMinLatitude(Float.parseFloat(fieldLatMin.getText()))'/>
+ <NumberEditor id='fieldLatMin' constructorParams='this'
+ bean='{getBean()}' property='minLatitude'
+ decorator='boxed' useSign='true'/>
</cell>
</row>
<row>
@@ -157,8 +165,9 @@
<JLabel text="isisfish.fisheryRegion.latitude.max"/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldLatMax" text='{getBean().getMaxLatitude()}' decorator='boxed'
- onKeyReleased='getBean().setMaxLatitude(Float.parseFloat(fieldLatMax.getText()))'/>
+ <NumberEditor id='fieldLatMax' constructorParams='this'
+ bean='{getBean()}' property='maxLatitude'
+ decorator='boxed' useSign='true'/>
</cell>
</row>
<row>
@@ -166,8 +175,9 @@
<JLabel text="isisfish.fisheryRegion.longitude.min"/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldLongMin" text='{getBean().getMinLongitude()}' decorator='boxed'
- onKeyReleased='getBean().setMinLongitude(Float.parseFloat(fieldLongMin.getText()))'/>
+ <NumberEditor id='fieldLongMin' constructorParams='this'
+ bean='{getBean()}' property='minLongitude'
+ decorator='boxed' useSign='true'/>
</cell>
</row>
<row>
@@ -175,8 +185,9 @@
<JLabel text="isisfish.fisheryRegion.longitude.max"/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldLongMax" text='{getBean().getMaxLongitude()}' decorator='boxed'
- onKeyReleased='getBean().setMaxLongitude(Float.parseFloat(fieldLongMax.getText()))'/>
+ <NumberEditor id='fieldLongMax' constructorParams='this'
+ bean='{getBean()}' property='maxLongitude'
+ decorator='boxed' useSign='true'/>
</cell>
</row>
<row>
@@ -189,8 +200,9 @@
<JLabel text="isisfish.fisheryRegion.latitude"/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldCellLengthLatitude" text='{getBean().getCellLengthLatitude()}' decorator='boxed'
- onKeyReleased='getBean().setCellLengthLatitude(Float.parseFloat(fieldCellLengthLatitude.getText()))'/>
+ <NumberEditor id='fieldCellLengthLatitude' constructorParams='this'
+ bean='{getBean()}' property='cellLengthLatitude'
+ decorator='boxed' useSign='true'/>
</cell>
</row>
<row>
@@ -198,8 +210,9 @@
<JLabel text="isisfish.fisheryRegion.longitude"/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldCellLengthLongitude" text='{getBean().getCellLengthLongitude()}' decorator='boxed'
- onKeyReleased='getBean().setCellLengthLongitude(Float.parseFloat(fieldCellLengthLongitude.getText()))'/>
+ <NumberEditor id='fieldCellLengthLongitude' constructorParams='this'
+ bean='{getBean()}' property='cellLengthLongitude'
+ decorator='boxed' useSign='true'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -43,6 +43,7 @@
import fr.ifremer.isisfish.ui.WelcomePanelUI;
import org.codelutin.topia.persistence.TopiaEntity;
import org.codelutin.topia.TopiaException;
+import jaxx.runtime.swing.editor.NumberEditor;
import jaxx.runtime.swing.navigation.NavigationTreeModel;
import jaxx.runtime.swing.navigation.NavigationTreeModel.NavigationTreeNode;
@@ -53,7 +54,7 @@
//jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
fieldGearName.setText("");
fieldGearEffortUnit.setText("");
- fieldGearStandardisationFactor.setText("");
+ fieldGearStandardisationFactor.setModelText("");
fieldGearParamName.setText("");
fieldGearComment.setText("");
}
@@ -71,6 +72,9 @@
Gear gear = getVerifier().getEntity(Gear.class);
setBean((GearImpl) gear);
getVerifier().addCurrentPanel(rangeOfValues);
+ if (getBean() != null){
+ fieldGearStandardisationFactor.init();
+ }
}
]]>
</script>
@@ -91,7 +95,8 @@
<JLabel text="isisfish.gear.effortUnit" enabled='{isActif()}'/>
</cell>
<cell columns="2" fill='horizontal' weightx='1.0'>
- <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}' onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextField id="fieldGearEffortUnit" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getEffortUnit())}'
+ onKeyReleased='getBean().setEffortUnit(fieldGearEffortUnit.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -99,7 +104,13 @@
<JLabel text="isisfish.gear.standardisationFactor" enabled='{isActif()}'/>
</cell>
<cell columns="2" fill='horizontal' weightx='1.0'>
- <JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}' onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"StandardisationFactor"'/>
+ <NumberEditor id='fieldGearStandardisationFactor' constructorParams='this'
+ bean='{getBean()}' property='standardisationFactor'
+ enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}'
+ _method='"StandardisationFactor"' useSign='true'/>
+ <!--JTextField id="fieldGearStandardisationFactor" text='{getBean().getStandardisationFactor()}'
+ onKeyReleased='getBean().setStandardisationFactor(Double.parseDouble(fieldGearStandardisationFactor.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{GearImpl.class}' _method='"StandardisationFactor"'/-->
</cell>
</row>
<row>
@@ -107,7 +118,8 @@
<JLabel text="isisfish.gear.technicalParameter" enabled='{isActif()}'/>
</cell>
<cell columns="2" fill='horizontal' weightx='1.0'>
- <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}' onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextField id="fieldGearParamName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getParameterName())}'
+ onKeyReleased='getBean().setParameterName(fieldGearParamName.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -115,7 +127,8 @@
<JLabel text="isisfish.gear.rangeValues" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='this' decorator='boxed' _bean='{GearImpl.class}' _method='"PossibleValue"'/>
+ <RangeOfValuesUI id="rangeOfValues" actif='{isActif()}' constructorParams='this'
+ decorator='boxed' _bean='{GearImpl.class}' _method='"PossibleValue"'/>
</cell>
</row>
<row>
@@ -124,7 +137,8 @@
</cell>
<cell columns="2" fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextArea id="fieldGearComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}'
+ onKeyReleased='getBean().setComment(fieldGearComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -81,8 +81,8 @@
import fr.ifremer.isisfish.ui.input.check.CheckRegion;
import fr.ifremer.isisfish.ui.input.check.CheckResult;
import fr.ifremer.isisfish.ui.input.check.CheckResultFrame;
-import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
import fr.ifremer.isisfish.util.CellPointcomparator;
+import jaxx.runtime.swing.ErrorDialogUI;
/**
* All code used in input UI.
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -51,9 +51,9 @@
import fr.ifremer.isisfish.IsisFishDAOHelper;
import fr.ifremer.isisfish.ui.SaveVerifier;
import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI;
-import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
import java.util.Map;
import java.util.Map.Entry;
+import jaxx.runtime.swing.ErrorDialogUI;
/**
* InputSaveVerifier.
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesEditorUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -44,8 +44,6 @@
<script><![CDATA[
import com.l2fprod.common.swing.renderer.BooleanCellRenderer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import fr.ifremer.isisfish.entities.Equation;
import fr.ifremer.isisfish.entities.Formule;
import fr.ifremer.isisfish.entities.Metier;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -41,8 +41,6 @@
<Boolean id='metierSeasonSelected' javaBean='false'/>
<script><![CDATA[
-import java.util.logging.Level;
-import java.util.logging.Logger;
import fr.ifremer.isisfish.entities.Metier;
import fr.ifremer.isisfish.entities.MetierImpl;
import fr.ifremer.isisfish.entities.MetierSeasonInfo;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -39,9 +39,7 @@
import fr.ifremer.isisfish.entities.Gear;
import fr.ifremer.isisfish.entities.Metier;
import fr.ifremer.isisfish.entities.MetierImpl;
- import java.util.logging.Logger;
- import java.util.logging.Level;
-
+
protected boolean init = false;
public void refresh() {
getVerifier().setSaveButton(save);
@@ -77,7 +75,9 @@
<JLabel text="isisfish.metier.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldMetierName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldMetierName.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextField id="fieldMetierName" text='{getBean().getName()}'
+ onKeyReleased='getBean().setName(fieldMetierName.getText())'
+ enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -85,7 +85,8 @@
<JLabel text="isisfish.common.gear" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()' enabled='{isActif()}' decorator='boxed'/>
+ <JComboBox id="fieldMetierGear" onActionPerformed='gearChanged()'
+ enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -93,7 +94,8 @@
<JLabel text="isisfish.metier.rangeValues" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}' onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextField id="fieldMetierParam" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGearParameterValue())}'
+ onKeyReleased='getBean().setGearParameterValue(fieldMetierParam.getText())' enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -102,7 +104,8 @@
</cell>
<cell fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
- <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextArea id="fieldMetierComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}'
+ onKeyReleased='getBean().setComment(fieldMetierComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -44,8 +44,6 @@
import fr.ifremer.isisfish.entities.PopulationGroup;
import fr.ifremer.isisfish.entities.Population;
import fr.ifremer.isisfish.entities.PopulationImpl;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.swing.table.DefaultTableModel;
import org.codelutin.topia.persistence.TopiaEntity;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -92,11 +92,9 @@
</row>
<row>
<cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
- <JScrollPane>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability'
- matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}'
- enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/>
- </JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability'
+ matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}'
+ enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -47,6 +47,7 @@
import fr.ifremer.isisfish.entities.PopulationImpl;
import org.codelutin.math.matrix.AbstractMatrixND;
import org.codelutin.math.matrix.MatrixND;
+import jaxx.runtime.swing.editor.NumberEditor;
addPropertyChangeListener("populationGroup", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -55,10 +56,10 @@
//jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
fieldPopulationGroupMeanWeight.setText("");
fieldPopulationGroupPrice.setText("");
- fieldPopulationGroupReproductionRate.setText("");
- fieldPopulationGroupAge.setText("");
- fieldPopulationGroupMinLength.setText("");
- fieldPopulationGroupMaxLength.setText("");
+ fieldPopulationGroupReproductionRate.setModelText("");
+ fieldPopulationGroupAge.setModelText("");
+ fieldPopulationGroupMinLength.setModelText("");
+ fieldPopulationGroupMaxLength.setModelText("");
fieldPopulationGroupComment.setText("");
fieldPopulationGroupNaturalDeathRate.setMatrix(null);
setPopGroupNotNull(false);
@@ -93,6 +94,12 @@
getVerifier().addCurrentEntity(getPopulationGroup());
setMatrix();
setPopGroupNotNull(true);
+ if (getPopulationGroup() != null){
+ fieldPopulationGroupReproductionRate.init();
+ fieldPopulationGroupAge.init();
+ fieldPopulationGroupMinLength.init();
+ fieldPopulationGroupMaxLength.init();
+ }
}
else{
setPopGroupNotNull(false);
@@ -133,11 +140,9 @@
<JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/>
</cell>
<cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
- <JScrollPane>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate'
- matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}'
- enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/>
- </JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate'
+ matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}'
+ enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/>
</cell>
</row>
<row>
@@ -145,7 +150,13 @@
<JLabel text="isisfish.populationGroup.reproductionRate" enabled='{isPopGroupNotNull()}'/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}' onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/>
+ <NumberEditor id='fieldPopulationGroupReproductionRate' constructorParams='this'
+ bean='{getPopulationGroup()}' property='reproductionRate'
+ useSign='true' enabled='{isPopGroupNotNull()}' decorator='boxed'
+ _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/>
+ <!--JTextField id="fieldPopulationGroupReproductionRate" text='{getPopulationGroup().getReproductionRate()}'
+ onKeyReleased='getPopulationGroup().setReproductionRate(Double.parseDouble(fieldPopulationGroupReproductionRate.getText()))'
+ enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"ReproductionRate"'/-->
</cell>
</row>
<row>
@@ -153,7 +164,13 @@
<JLabel text="isisfish.populationGroup.age" enabled='{isPopGroupNotNull()}'/>
</cell>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}' onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/>
+ <NumberEditor id='fieldPopulationGroupAge' constructorParams='this'
+ bean='{getPopulationGroup()}' property='age'
+ useSign='true' enabled='{isPopGroupNotNull()}' decorator='boxed'
+ _bean='{PopulationGroupImpl.class}' _method='"Age"'/>
+ <!--JTextField id="fieldPopulationGroupAge" text='{getPopulationGroup().getAge()}'
+ onKeyReleased='getPopulationGroup().setAge(Double.parseDouble(fieldPopulationGroupAge.getText()))'
+ enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"Age"'/-->
</cell>
</row>
<row>
@@ -161,10 +178,24 @@
<JLabel text="isisfish.populationGroup.length" enabled='{isPopGroupNotNull()}'/>
</cell>
<cell fill='both' weightx='0.5'>
- <JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}' toolTipText="minimum length" onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/>
+ <NumberEditor id='fieldPopulationGroupMinLength' constructorParams='this'
+ bean='{getPopulationGroup()}' property='minLength'
+ toolTipText="minimum length" useSign='true'
+ enabled='{isPopGroupNotNull()}' decorator='boxed'
+ _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/>
+ <!--JTextField id="fieldPopulationGroupMinLength" text='{getPopulationGroup().getMinLength()}'
+ toolTipText="minimum length" onKeyReleased='getPopulationGroup().setMinLength(Double.parseDouble(fieldPopulationGroupMinLength.getText()))'
+ enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MinLength"'/-->
</cell>
<cell fill='both' weightx='0.5'>
- <JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}' toolTipText="maximum length" onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/>
+ <NumberEditor id='fieldPopulationGroupMaxLength' constructorParams='this'
+ bean='{getPopulationGroup()}' property='maxLength'
+ toolTipText="maximum length" useSign='true'
+ enabled='{isPopGroupNotNull()}' decorator='boxed'
+ _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/>
+ <!--JTextField id="fieldPopulationGroupMaxLength" text='{getPopulationGroup().getMaxLength()}'
+ toolTipText="maximum length" onKeyReleased='getPopulationGroup().setMaxLength(Double.parseDouble(fieldPopulationGroupMaxLength.getText()))'
+ enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationGroupImpl.class}' _method='"MaxLength"'/-->
</cell>
</row>
<row>
@@ -173,7 +204,8 @@
</cell>
<cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
<JScrollPane>
- <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}' onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed'/>
+ <JTextArea id="fieldPopulationGroupComment" text='{jaxx.runtime.SwingUtil.getStringValue(getPopulationGroup().getComment())}'
+ onKeyReleased='getPopulationGroup().setComment(fieldPopulationGroupComment.getText())' enabled='{isPopGroupNotNull()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -204,9 +204,7 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <JScrollPane>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' linearModel="true" enabled='{isActif()}'/>
- </JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' linearModel="true" enabled='{isActif()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -185,9 +185,7 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <JScrollPane>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationImmigrationTable' linearModel="true" enabled='{isActif()}'/>
- </JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationImmigrationTable' linearModel="true" enabled='{isActif()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -55,8 +55,6 @@
import org.codelutin.math.matrix.MatrixND;
import org.codelutin.math.matrix.gui.MatrixPanelEvent;
import org.codelutin.math.matrix.gui.MatrixPanelListener;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
addPropertyChangeListener("bean", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -215,9 +213,7 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <JScrollPane>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' linearModel='{true}' enabled='{isActif()}'/>
- </JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' linearModel='{true}' enabled='{isActif()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -30,15 +30,14 @@
import fr.ifremer.isisfish.entities.PopulationImpl;
import org.codelutin.math.matrix.gui.MatrixPanelEvent;
import org.codelutin.math.matrix.gui.MatrixPanelListener;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import jaxx.runtime.swing.editor.NumberEditor;
addPropertyChangeListener("bean", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
if (evt.getOldValue() != null || evt.getNewValue() == null) {
// remove previous binding on getBean()
//jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
- fieldPopulationMonthGapBetweenReproRecrutement.setText("");
+ fieldPopulationMonthGapBetweenReproRecrutement.setModelText("");
fieldPopulationRecruitmentComment.setText("");
}
if (evt.getNewValue() != null) {
@@ -69,6 +68,7 @@
if(getBean() != null && getBean().getRecruitmentDistribution() != null){
fieldPopulationRecruitmentDistribution.setMatrix(getBean().getRecruitmentDistribution().copy());
+ fieldPopulationMonthGapBetweenReproRecrutement.init();
}
fieldPopulationRecruitmentDistribution.addMatrixListener(listener);
}
@@ -92,7 +92,13 @@
<JLabel text="isisfish.populationRecruitment.monthgapgetweenreprorecruitment" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}' onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/>
+ <NumberEditor id='fieldPopulationMonthGapBetweenReproRecrutement' constructorParams='this'
+ bean='{getBean()}' property='monthGapBetweenReproRecrutement' useSign='true'
+ enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}'
+ _method='"MonthGapBetweenReproRecrutement"'/>
+ <!--JTextField id="fieldPopulationMonthGapBetweenReproRecrutement" text='{getBean().getMonthGapBetweenReproRecrutement()}'
+ onKeyReleased='getBean().setMonthGapBetweenReproRecrutement(Integer.parseInt(fieldPopulationMonthGapBetweenReproRecrutement.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"MonthGapBetweenReproRecrutement"'/-->
</cell>
</row>
<row>
@@ -100,11 +106,9 @@
<JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActif()}'/>
</cell>
<cell fill='both' weightx='1.0'>
- <JScrollPane>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution'
- matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}'
- enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/>
- </JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution'
+ matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}'
+ enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -17,7 +17,7 @@
import org.codelutin.math.matrix.MatrixND;
import org.codelutin.math.matrix.gui.MatrixPanelEvent;
import org.codelutin.math.matrix.gui.MatrixPanelListener;
-import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
+import jaxx.runtime.swing.ErrorDialogUI;
protected MatrixPanelListener listener = null;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -167,9 +167,7 @@
</row>
<row>
<cell columns='3' fill='both' weightx='1.0' weighty='0.5'>
- <JScrollPane>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/>
- </JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsTabsUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -31,6 +31,7 @@
import fr.ifremer.isisfish.entities.VesselType;
import fr.ifremer.isisfish.entities.Formule;
import fr.ifremer.isisfish.entities.SetOfVessels;
+import jaxx.runtime.swing.editor.NumberEditor;
import fr.ifremer.isisfish.entities.SetOfVesselsImpl;
boolean init = false;
@@ -60,6 +61,8 @@
jaxx.runtime.SwingUtil.fillComboBox(fieldSetOfVesselsVesselType,getRegion().getVesselType(), getBean().getVesselType(), true);
init=false;
getVerifier().addCurrentPanel(technicalEfficiency);
+ fieldSetOfVesselsNumberOfVessels.init();
+ fieldSetOfVesselsFixedCosts.init();
}
}
protected void portChanged(){
@@ -107,7 +110,13 @@
<JLabel text="isisfish.setOfVessels.numberOfVessels" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}' onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/>
+ <NumberEditor id='fieldSetOfVesselsNumberOfVessels' constructorParams='this'
+ bean='{getBean()}' property='numberOfVessels'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/>
+ <!--JTextField id="fieldSetOfVesselsNumberOfVessels" text='{getBean().getNumberOfVessels()}'
+ onKeyReleased='getBean().setNumberOfVessels(Integer.parseInt(fieldSetOfVesselsNumberOfVessels.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"NumberOfVessels"'/-->
</cell>
</row>
<row>
@@ -115,9 +124,13 @@
<JLabel text="isisfish.setOfVessels.fixedCosts" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}'
+ <NumberEditor id='fieldSetOfVesselsFixedCosts' constructorParams='this'
+ bean='{getBean()}' property='fixedCosts'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/>
+ <!--JTextField id="fieldSetOfVesselsFixedCosts" text='{getBean().getFixedCosts()}'
onKeyReleased='getBean().setFixedCosts(Double.parseDouble(fieldSetOfVesselsFixedCosts.getText()))'
- enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/>
+ enabled='{isActif()}' decorator='boxed' _bean='{SetOfVesselsImpl.class}' _method='"FixedCosts"'/-->
</cell>
</row>
<row>
@@ -135,7 +148,8 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextArea id="fieldSetOfVesselsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}'
+ onKeyReleased='getBean().setComment(fieldSetOfVesselsComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -43,6 +43,7 @@
<script><![CDATA[
import fr.ifremer.isisfish.entities.Species;
import fr.ifremer.isisfish.entities.SpeciesImpl;
+import jaxx.runtime.swing.editor.NumberEditor;
setButtonTitle(_("isisfish.input.continuePopulations"));
addPropertyChangeListener("bean", new PropertyChangeListener() {
@@ -53,7 +54,7 @@
fieldSpeciesName.setText("");
fieldSpeciesScientificName.setText("");
fieldSpeciesCodeRubbin.setText("");
- fieldSpeciesCEE.setText(0 + "");
+ fieldSpeciesCEE.setModelText(0 + "");
fieldSpeciesComment.setText("");
}
if (evt.getNewValue() != null) {
@@ -71,8 +72,10 @@
setBean((SpeciesImpl) species);
if (getBean() != null){
setNextPath("$root/$species/" + getBean().getTopiaId() + "/$populations");
+ fieldSpeciesCEE.init();
}
}
+
]]>
</script>
<Table id='body'>
@@ -84,7 +87,9 @@
<JLabel text="isisfish.species.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' columns='2' weightx='1.0'>
- <JTextField id="fieldSpeciesName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldSpeciesName.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextField id="fieldSpeciesName" text='{getBean().getName()}'
+ onKeyReleased='getBean().setName(fieldSpeciesName.getText())'
+ enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -92,7 +97,9 @@
<JLabel text="isisfish.species.scientificName" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' columns='2' weightx='1.0'>
- <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}' onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"ScientificName"'/>
+ <JTextField id="fieldSpeciesScientificName" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getScientificName())}'
+ onKeyReleased='getBean().setScientificName(fieldSpeciesScientificName.getText())'
+ enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"ScientificName"'/>
</cell>
</row>
<row>
@@ -100,7 +107,9 @@
<JLabel text="isisfish.species.rubbinCode" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' columns='2' weightx='1.0'>
- <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}' onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeRubbin"'/>
+ <JTextField id="fieldSpeciesCodeRubbin" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getCodeRubbin())}'
+ onKeyReleased='getBean().setCodeRubbin(fieldSpeciesCodeRubbin.getText())' enabled='{isActif()}'
+ decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeRubbin"'/>
</cell>
</row>
<row>
@@ -108,7 +117,13 @@
<JLabel text="isisfish.species.cee" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' columns='2' weightx='1.0'>
- <JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}' onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeCEE"'/>
+ <NumberEditor id='fieldSpeciesCEE' constructorParams='this'
+ bean='{getBean()}' property='codeCEE'
+ decorator='boxed' _bean='{SpeciesImpl.class}'
+ useSign='true' _method='"CodeCEE"'/>
+ <!--JTextField id="fieldSpeciesCEE" text='{getBean().getCodeCEE()}'
+ onKeyReleased='getBean().setCodeCEE(Integer.parseInt(fieldSpeciesCEE.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{SpeciesImpl.class}' _method='"CodeCEE"'/-->
</cell>
</row>
<row>
@@ -125,7 +140,8 @@
</cell>
<cell fill='both' columns='2' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextArea id="fieldSpeciesComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}'
+ onKeyReleased='getBean().setComment(fieldSpeciesComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -47,6 +47,7 @@
import fr.ifremer.isisfish.entities.StrategyImpl;
import org.codelutin.math.matrix.gui.MatrixPanelEvent;
import org.codelutin.math.matrix.gui.MatrixPanelListener;
+import jaxx.runtime.swing.editor.NumberEditor;
import fr.ifremer.isisfish.types.Month;
import fr.ifremer.isisfish.entities.TripType;
import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
@@ -62,7 +63,7 @@
// remove previous binding on getBean()
//jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
numberOfTrips.setText("");
- fieldStrategyMonthInfoMinInactivityDays.setText("");
+ fieldStrategyMonthInfoMinInactivityDays.setModelText("");
fieldStrategyMonthInfoProportion.setMatrix(null);
}
if (evt.getNewValue() != null) {
@@ -104,6 +105,7 @@
fieldStrategyMonthInfoTripType.addActionListener(listener);
}
setMatrix();
+ fieldStrategyMonthInfoMinInactivityDays.init();
}
matrixListener = new MatrixPanelListener() {
@@ -131,7 +133,8 @@
</row>
<row>
<cell columns='2' fill='horizontal' weightx='1.0'>
- <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())' enabled='{isActif()}' decorator='boxed'/>
+ <JComboBox id="fieldStrategyMonthInfoTripType" onActionPerformed='getStrategyMonthInfo().setTripType((TripType)fieldStrategyMonthInfoTripType.getSelectedItem())'
+ enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -139,7 +142,8 @@
<JLabel text="isisfish.strategyMonthInfo.numberOfTrips" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='0.5' anchor='west'>
- <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/>
+ <JLabel id='numberOfTrips' text='{getStrategyMonthInfo().getNumberOfTrips()}' enabled='{isActif()}'
+ decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"NumberOfTrips"'/>
</cell>
</row>
<row>
@@ -147,14 +151,20 @@
<JLabel text="isisfish.strategyMonthInfo.minInactivityDays" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}' onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/>
+ <NumberEditor id='fieldStrategyMonthInfoMinInactivityDays' constructorParams='this'
+ bean='{getStrategyMonthInfo()}' property='minInactivityDays'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/>
+ <!--JTextField id="fieldStrategyMonthInfoMinInactivityDays" text='{getStrategyMonthInfo().getMinInactivityDays()}'
+ onKeyReleased='getStrategyMonthInfo().setMinInactivityDays(Double.parseDouble(fieldStrategyMonthInfoMinInactivityDays.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"MinInactivityDays"'/-->
</cell>
</row>
<row>
<cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
- <JScrollPane>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/>
- </JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}'
+ linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}'
+ enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -45,8 +45,7 @@
import org.codelutin.topia.persistence.TopiaEntity;
import fr.ifremer.isisfish.ui.WelcomePanelUI;
import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import jaxx.runtime.swing.editor.NumberEditor;
addPropertyChangeListener("bean", new PropertyChangeListener() {
public void propertyChange(PropertyChangeEvent evt) {
@@ -54,7 +53,7 @@
// remove previous binding on getBean()
//jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");fieldPopulationBasicsName.setText("");
fieldStrategyName.setText("");
- fieldStrategyProportionSetOfVessels.setText("0.0");
+ fieldStrategyProportionSetOfVessels.setModelText("0.0");
fieldStrategyComment.setText("");
}
if (evt.getNewValue() != null) {
@@ -74,6 +73,7 @@
if (getBean() != null){
getVerifier().addCurrentPanel(strategyInactivity);
setSetOfVesselsModel();
+ fieldStrategyProportionSetOfVessels.init();
}
}
protected void setSetOfVesselsModel() {
@@ -112,9 +112,13 @@
<JLabel text="isisfish.strategy.proportionSetOfVessels" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldStrategyProportionSetOfVessels" text='{getBean().getProportionSetOfVessels()}'
+ <NumberEditor id='fieldStrategyProportionSetOfVessels' constructorParams='this'
+ bean='{getBean()}' property='proportionSetOfVessels'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/>
+ <!--JTextField id="fieldStrategyProportionSetOfVessels" text='{getBean().getProportionSetOfVessels()}'
onKeyReleased='getBean().setProportionSetOfVessels(Double.parseDouble(fieldStrategyProportionSetOfVessels.getText()))'
- enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/>
+ enabled='{isActif()}' decorator='boxed' _bean='{StrategyImpl.class}' _method='"ProportionSetOfVessels"'/-->
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -81,7 +81,9 @@
<JLabel text="isisfish.tripType.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldTripTypeName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldTripTypeName.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextField id="fieldTripTypeName" text='{getBean().getName()}'
+ onKeyReleased='getBean().setName(fieldTripTypeName.getText())'
+ enabled='{isActif()}' decorator='boxed'/>
</cell>
</row>
<row>
@@ -89,7 +91,9 @@
<JLabel text="isisfish.tripType.duration" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' toolTipText="in hour" onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"TripDuration"'/>
+ <JTextField id="fieldTripTypeDuration" text='{getBean().getTripDuration().getHour()}' toolTipText="in hour"
+ onKeyReleased='getBean().setTripDuration(new TimeUnit(Double.parseDouble(fieldTripTypeDuration.getText()) * 3600))'
+ enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"TripDuration"'/>
</cell>
</row>
<row>
@@ -97,7 +101,9 @@
<JLabel text="isisfish.tripType.minTime" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{getBean().getMinTimeBetweenTrip().getHour()}' onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))' enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"MinTimeBetweenTrip"'/>
+ <JTextField id="fieldTripTypeMinTimeBetweenTrip" text='{getBean().getMinTimeBetweenTrip().getHour()}'
+ onKeyReleased='getBean().setMinTimeBetweenTrip(new TimeUnit(Double.parseDouble(fieldTripTypeMinTimeBetweenTrip.getText()) * 3600))'
+ enabled='{isActif()}' decorator='boxed' _bean='{TripTypeImpl.class}' _method='"MinTimeBetweenTrip"'/>
</cell>
</row>
<row>
@@ -106,7 +112,8 @@
</cell>
<cell fill='both' weightx='1.0' weighty='1.0'>
<JScrollPane>
- <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextArea id="fieldTripTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}'
+ onKeyReleased='getBean().setComment(fieldTripTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -40,6 +40,7 @@
import fr.ifremer.isisfish.entities.VesselType;
import fr.ifremer.isisfish.entities.VesselTypeImpl;
import fr.ifremer.isisfish.entities.TripType;
+import jaxx.runtime.swing.editor.NumberEditor;
import jaxx.runtime.swing.Item;
import fr.ifremer.isisfish.types.TimeUnit;
@@ -51,13 +52,13 @@
// remove previous binding on getBean()
//jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text");
fieldVesselTypeName.setText("");
- fieldVesselTypeLength.setText("");
- fieldVesselTypeSpeed.setText("");
+ fieldVesselTypeLength.setModelText("");
+ fieldVesselTypeSpeed.setModelText("");
fieldVesselTypeMaxTripDuration.setText("");
- fieldVesselTypeActivityRange.setText("");
- fieldVesselTypeMinCrewSize.setText("");
- fieldVesselTypeSpeed.setText("");
- fieldVesselTypeUnitFuelCostOfTravel.setText("");
+ fieldVesselTypeActivityRange.setModelText("");
+ fieldVesselTypeMinCrewSize.setModelText("");
+ fieldVesselTypeSpeed.setModelText("");
+ fieldVesselTypeUnitFuelCostOfTravel.setModelText("");
fieldVesselTypeComment.setText("");
}
if (evt.getNewValue() != null) {
@@ -75,6 +76,13 @@
setBean((VesselTypeImpl) vesselType);
if (getBean() != null){
setListModel();
+ fieldVesselTypeLength.init();
+ fieldVesselTypeLength.init();
+ fieldVesselTypeSpeed.init();
+ fieldVesselTypeActivityRange.init();
+ fieldVesselTypeMinCrewSize.init();
+ fieldVesselTypeSpeed.init();
+ fieldVesselTypeUnitFuelCostOfTravel.init();
}
}
protected void setListModel(){
@@ -102,7 +110,8 @@
<JLabel text="isisfish.vesselType.name" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}' onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed'/>
+ <JTextField id="fieldVesselTypeName" text='{getBean().getName()}' enabled='{isActif()}'
+ onKeyReleased='getBean().setName(fieldVesselTypeName.getText())' decorator='boxed'/>
</cell>
</row>
<row>
@@ -110,7 +119,13 @@
<JLabel text="isisfish.vesselType.length" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}' onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/>
+ <NumberEditor id='fieldVesselTypeLength' constructorParams='this'
+ bean='{getBean()}' property='length'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{VesselTypeImpl.class}' _method='"Length"'/>
+ <!--JTextField id="fieldVesselTypeLength" text='{getBean().getLength()}' enabled='{isActif()}'
+ onKeyReleased='getBean().setLength(Integer.parseInt(fieldVesselTypeLength.getText()))'
+ decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Length"'/-->
</cell>
</row>
<row>
@@ -118,7 +133,13 @@
<JLabel text="isisfish.vesselType.speed" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}' onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/>
+ <NumberEditor id='fieldVesselTypeSpeed' constructorParams='this'
+ bean='{getBean()}' property='speed' useSign='true'
+ enabled='{isActif()}' decorator='boxed'
+ _bean='{VesselTypeImpl.class}' _method='"Speed"'/>
+ <!--JTextField id="fieldVesselTypeSpeed" text='{getBean().getSpeed()}' enabled='{isActif()}'
+ onKeyReleased='getBean().setSpeed(Double.parseDouble(fieldVesselTypeSpeed.getText()))'
+ decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"Speed"'/-->
</cell>
</row>
<row>
@@ -126,7 +147,9 @@
<JLabel text="isisfish.vesselType.maxDuration" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' toolTipText="in hour" enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MaxTripDuration"'/>
+ <JTextField id="fieldVesselTypeMaxTripDuration" text='{getBean().getMaxTripDuration().getHour()}' toolTipText="in hour"
+ enabled='{isActif()}' onKeyReleased='getBean().setMaxTripDuration(new TimeUnit(Double.parseDouble(fieldVesselTypeMaxTripDuration.getText()) * 3600))'
+ decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MaxTripDuration"'/>
</cell>
</row>
<row>
@@ -134,7 +157,13 @@
<JLabel text="isisfish.vesselType.activityRange" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}' onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/>
+ <NumberEditor id='fieldVesselTypeActivityRange' constructorParams='this'
+ bean='{getBean()}' property='activityRange'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/>
+ <!--JTextField id="fieldVesselTypeActivityRange" text='{getBean().getActivityRange()}' enabled='{isActif()}'
+ onKeyReleased='getBean().setActivityRange(Double.parseDouble(fieldVesselTypeActivityRange.getText()))'
+ decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"ActivityRange"'/-->
</cell>
</row>
<row>
@@ -142,7 +171,13 @@
<JLabel text="isisfish.vesselType.miniCrew" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}' onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/>
+ <NumberEditor id='fieldVesselTypeMinCrewSize' constructorParams='this'
+ bean='{getBean()}' property='minCrewSize' useSign='true'
+ enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}'
+ _method='"MinCrewSize"'/>
+ <!--JTextField id="fieldVesselTypeMinCrewSize" text='{getBean().getMinCrewSize()}' enabled='{isActif()}'
+ onKeyReleased='getBean().setMinCrewSize(Integer.parseInt(fieldVesselTypeMinCrewSize.getText()))'
+ decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"MinCrewSize"'/-->
</cell>
</row>
<row>
@@ -150,7 +185,13 @@
<JLabel text="isisfish.vesselType.fuelCost" enabled='{isActif()}'/>
</cell>
<cell fill='horizontal' weightx='1.0'>
- <JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}' onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/>
+ <NumberEditor id='fieldVesselTypeUnitFuelCostOfTravel' constructorParams='this'
+ bean='{getBean()}' property='unitFuelCostOfTravel'
+ enabled='{isActif()}' decorator='boxed' useSign='true'
+ _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/>
+ <!--JTextField id="fieldVesselTypeUnitFuelCostOfTravel" text='{getBean().getUnitFuelCostOfTravel()}'
+ onKeyReleased='getBean().setUnitFuelCostOfTravel(Double.parseDouble(fieldVesselTypeUnitFuelCostOfTravel.getText()))'
+ enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"UnitFuelCostOfTravel"'/-->
</cell>
</row>
<row>
@@ -159,7 +200,8 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.7'>
<JScrollPane>
- <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()' enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"TripType"'/>
+ <JList id="vesselTypeTripType" selectedValues='{getBean().getTripType().toArray()}' onMouseClicked='tripTypeChanged()'
+ enabled='{isActif()}' decorator='boxed' _bean='{VesselTypeImpl.class}' _method='"TripType"'/>
</JScrollPane>
</cell>
</row>
@@ -169,7 +211,8 @@
</cell>
<cell fill='both' weightx='1.0' weighty='0.3'>
<JScrollPane>
- <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/>
+ <JTextArea id="fieldVesselTypeComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}'
+ onKeyReleased='getBean().setComment(fieldVesselTypeComment.getText())' enabled='{isActif()}' decorator='boxed'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/DataResult.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -17,6 +17,8 @@
import java.io.FileWriter;
import java.util.Iterator;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.codelutin.math.matrix.MatrixND;
import org.codelutin.util.FileUtil;
@@ -27,6 +29,9 @@
*/
public class DataResult extends DataResultUI { // IfremerSimulation
+ /** Class logger. */
+ private static Log log = LogFactory.getLog(DataResult.class);
+
protected MatrixND matrix;
public DataResult() {
@@ -105,7 +110,7 @@
writer.close();
}
}catch(Exception eee){
- java.util.logging.Logger.getLogger("org.codelutin.resultat.DataResult.on_exportButton_clicked").severe(":104:Error during export"+eee);
+ log.error(":104:Error during export"+eee);
}
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultEdit.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -29,8 +29,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Vector;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.swing.ButtonGroup;
import javax.swing.JList;
@@ -423,7 +421,7 @@
mapBean.removeAllResultatLayer();
mapBean.addResultatLayer(matInfo.getName(), layer);
}catch(Exception eee){
- Logger.getLogger(getClass().getName() + ".addRendu").log(Level.WARNING, "Erreur lors de l'ajout du résultat à la carte. ", eee);
+ log.warn("Erreur lors de l'ajout du résultat à la carte. ", eee);
JOptionPane.showMessageDialog(null, _("isisfish.error.add.card"), _("isisfish.common.alert"), JOptionPane.ERROR_MESSAGE);
}
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/result/ResultView.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -10,9 +10,6 @@
* @version
*/
-import java.beans.PropertyChangeEvent;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import static org.codelutin.i18n.I18n._;
import fr.ifremer.isisfish.datastore.SimulationStorage;
@@ -22,7 +19,6 @@
import fr.ifremer.isisfish.simulator.launcher.SimulationService;
import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil;
-import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
import fr.ifremer.isisfish.ui.widget.filter.FilterModel;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -30,12 +26,11 @@
import javax.swing.*;
import java.awt.*;
import java.awt.event.ItemEvent;
-import java.beans.PropertyChangeListener;
import java.beans.PropertyVetoException;
import java.io.IOException;
import java.text.ParseException;
-import java.util.*;
import java.util.List;
+import jaxx.runtime.swing.ErrorDialogUI;
public class ResultView extends ResultViewUI {
@@ -55,9 +50,9 @@
try {
initSimulation();
} catch (IOException ex) {
- Logger.getLogger(ResultView.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
} catch (ParseException ex) {
- Logger.getLogger(ResultView.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
}
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -56,13 +56,13 @@
import fr.ifremer.isisfish.datastore.SensitivityStorage;
import fr.ifremer.isisfish.datastore.SimulatorStorage;
import fr.ifremer.isisfish.equation.Language;
-import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
import fr.ifremer.isisfish.util.ClasspathTemplateLoader;
import fr.ifremer.isisfish.vcs.VCSException;
import freemarker.cache.TemplateLoader;
import freemarker.template.Configuration;
import freemarker.template.Template;
+import jaxx.runtime.swing.ErrorDialogUI;
class ScriptFileFilter implements FileFilter {
protected FileFilter filter;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -29,6 +29,7 @@
import fr.ifremer.isisfish.ui.input.InputAction;
import fr.ifremer.isisfish.ui.input.InputOneEquationUI;
import fr.ifremer.isisfish.ui.input.InputSaveVerifier;
+import fr.ifremer.isisfish.ui.input.InputTabbedPaneListener;
import fr.ifremer.isisfish.ui.input.MetierSeasonInfoSpeciesEditorUI;
import fr.ifremer.isisfish.ui.input.PopulationMigrationEmigrationUI;
import fr.ifremer.isisfish.ui.input.PopulationMigrationImmigrationUI;
@@ -37,8 +38,6 @@
import fr.ifremer.isisfish.ui.input.SpeciesStructuredUI;
import fr.ifremer.isisfish.ui.widget.IntervalPanel;
import java.lang.reflect.Method;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import javax.swing.JCheckBox;
import javax.swing.JComboBox;
import javax.swing.JComponent;
@@ -50,7 +49,6 @@
import jaxx.runtime.JAXXInitialContext;
import jaxx.runtime.swing.JAXXList;
import org.codelutin.math.matrix.MatrixND;
-import org.codelutin.math.matrix.gui.MatrixEditor;
import org.codelutin.math.matrix.gui.JAXXMatrixEditor;
import org.codelutin.topia.persistence.TopiaEntity;
import fr.ifremer.isisfish.ui.input.RangeOfValuesUI;
@@ -58,6 +56,10 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import jaxx.runtime.swing.editor.NumberEditor;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.codelutin.math.matrix.gui.MatrixEditor;
/**
*
@@ -65,6 +67,9 @@
*/
public class EditorHelper {
+ /** Class logger. */
+ private static Log log = LogFactory.getLog(InputTabbedPaneListener.class);
+
public static String getMethod(JComponent c){
return (String) c.getClientProperty("method");
}
@@ -77,6 +82,12 @@
if (result instanceof JTextField) {
((JTextComponent) result).setText(String.valueOf(callMethod(e, fieldName)));
+ } else if (result instanceof NumberEditor){
+ NumberEditor ui = (NumberEditor) c;
+ JTextField numEditor = new JTextField();
+ numEditor.setText(String.valueOf(ui.getModel()));
+ result = numEditor;
+
} else if (result instanceof MatrixEditor){
MatrixEditor ui = (MatrixEditor) c;
MatrixND m = (MatrixND)callMethod(e, fieldName);
@@ -190,7 +201,7 @@
result = ui;
}
} catch (Exception ex) {
- Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
}
return result;
}
@@ -225,7 +236,7 @@
continuousPanel.init(getNewBoundEditor(c, e), getNewBoundEditor(c, e));
}
} catch (Exception ex) {
- Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
}
return result;
}
@@ -275,7 +286,7 @@
continuousPanel.init(new JTextField(String.valueOf(domain.getMinBound())), new JTextField(String.valueOf(domain.getMaxBound())));
}
} catch (Exception ex) {
- Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
}
return result;
}
@@ -292,6 +303,11 @@
if (result instanceof JTextComponent) {
((JTextComponent) result).setText(String.valueOf(value));
+ } else if (result instanceof NumberEditor){
+ JTextField numEditor = new JTextField();
+ numEditor.setText(String.valueOf(value));
+ result = numEditor;
+
} else if (result instanceof JTable){
// ((JTable) result).setModel(((JTable)c).getModel());
@@ -414,7 +430,7 @@
result = ui;
}
} catch (Exception ex) {
- Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
}
return result;
}
@@ -422,6 +438,8 @@
Object result = null;
if (c instanceof JTextComponent) {
result = ((JTextComponent)c).getText();
+ } else if (c instanceof NumberEditor){
+ result = ((NumberEditor)c).getModel();
} else if (c instanceof PopulationZonesEditorUI){
result = ((PopulationZonesEditorUI)c).getFieldPopulationMappingZoneReproZoneRecru().getMatrix();
} else if (c instanceof JTable){
@@ -496,6 +514,8 @@
if (c instanceof JTextComponent) {
Object o = callMethod(e, fieldName);
return canBeContinue(c, o);
+ } else if (c instanceof NumberEditor){
+ return true;
} else if (c instanceof InputOneEquationUI){
return true;
} else if (c instanceof MatrixEditor){
@@ -526,7 +546,7 @@
Method m = e.getClass().getMethod("get" + fieldName, null);
result = m.invoke(e, (Object[])null);
} catch (Exception ex) {
- Logger.getLogger(EditorHelper.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
}
return result;
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanelUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -32,9 +32,7 @@
<JLabel text='isisfish.factor.value' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/>
</cell>
<cell fill='both' weightx='1' weighty='1'>
- <!--JScrollPane-->
- <JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/>
- <!--/JScrollPane-->
+ <JAXXMatrixEditor id='componentPanel' dimensionEdit='{false}' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabbedPaneListener.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -19,11 +19,12 @@
package fr.ifremer.isisfish.ui.sensitivity;
import fr.ifremer.isisfish.ui.input.InputContentUI;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+import fr.ifremer.isisfish.ui.input.InputTabbedPaneListener;
import javax.swing.JTabbedPane;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
*
@@ -31,6 +32,9 @@
*/
public class SensitivityTabbedPaneListener implements ChangeListener{
+ /** Class logger. */
+ private static Log log = LogFactory.getLog(InputTabbedPaneListener.class);
+
protected int cacheSelectedIndex = -1;
@Override
@@ -57,7 +61,7 @@
}
}
} catch (Exception ex) {
- Logger.getLogger(SensitivityTabbedPaneListener.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
}
}
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -81,8 +81,8 @@
import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain;
import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain;
import fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterUtil;
-import fr.ifremer.isisfish.ui.widget.ErrorDialogUI;
import fr.ifremer.isisfish.ui.widget.filter.FilterModel;
+import jaxx.runtime.swing.ErrorDialogUI;
/**
* SimulAction.
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/util/UtilsUI.java 2009-05-07 17:03:19 UTC (rev 2200)
@@ -6,16 +6,10 @@
package fr.ifremer.isisfish.ui.util;
import java.io.InputStream;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
import java.io.IOException;
import java.util.Properties;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import static org.codelutin.i18n.I18n._;
/**
*
@@ -40,12 +34,12 @@
data = new Properties();
data.load(stream);
} catch (IOException ex) {
- Logger.getLogger(UtilsUI.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
} finally{
try {
stream.close();
} catch (IOException ex) {
- Logger.getLogger(UtilsUI.class.getName()).log(Level.SEVERE, null, ex);
+ log.error(ex);
}
}
return data;
Deleted: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/ErrorDialogUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/ErrorDialogUI.jaxx 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/widget/ErrorDialogUI.jaxx 2009-05-07 17:03:19 UTC (rev 2200)
@@ -1,83 +0,0 @@
-<!--
-/* *##%
- * Copyright (C) 2005 - 2009 Ifremer, Code Lutin
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *##%*/
-
-/**
- * ErrorDialogUI.java
- *
- * @author letellier
- * @version $Revision: 1312 $
- *
- * Last update: $Date: 2008-08-28 10:21:07 +0200 (jeu, 28 aoû 2008) $
- * by : $Author: sletellier $
- */
--->
-
-<JDialog title='isisfish.error.dialog.title'>
- <script>
-/** Le dialogue pour afficher les erreurs. */
-protected static ErrorDialogUI instance;
-
-public static void showError(Exception e) {
- if (instance == null) {
- instance = new ErrorDialogUI();
- }
- instance.getErrorMessage().setText(e.getMessage());
- StringWriter w = new StringWriter();
- e.printStackTrace(new PrintWriter(w));
- instance.getErrorStack().setText(w.toString());
- instance.getErrorStack().setCaretPosition(0);
- instance.pack();
- instance.setVisible(true);
-}
-public static void disposeUI() {
- instance=null;
-}
-
-JRootPane rootPane = getRootPane();
-rootPane.setDefaultButton(close);
-rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke("ESCAPE"), "close");
-rootPane.getActionMap().put("close", close.getAction());
- </script>
- <Table>
- <row fill='both'>
- <cell>
- <JPanel>
- <JLabel text='isisfish.error.dialog.message'/>
- </JPanel>
- </cell>
- </row>
- <row fill='both'>
- <cell>
- <JLabel id='errorMessage'/>
- </cell>
- </row>
- <row fill='both' weightx='1' weighty='1'>
- <cell>
- <JScrollPane width='600' height='200'>
- <JTextArea id='errorStack' editable='false' font-size='9'/>
- </JScrollPane>
- </cell>
- </row>
- <row fill='horizontal'>
- <cell>
- <JButton id='close' text='isisfish.welcome.menu.close' onActionPerformed='dispose()'/>
- </cell>
- </row>
- </Table>
-</JDialog>
Deleted: isis-fish/trunk/src/main/resources/icons/building.png
===================================================================
(Binary files differ)
Deleted: isis-fish/trunk/src/main/resources/icons/building_add.png
===================================================================
(Binary files differ)
Modified: isis-fish/trunk/src/main/resources/log4j.properties
===================================================================
--- isis-fish/trunk/src/main/resources/log4j.properties 2009-05-07 16:51:57 UTC (rev 2199)
+++ isis-fish/trunk/src/main/resources/log4j.properties 2009-05-07 17:03:19 UTC (rev 2200)
@@ -6,8 +6,9 @@
log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n
# package level
-log4j.logger.fr.ifremer.isisfish=INFO
+log4j.logger.fr.ifremer.isisfish.ui=DEBUG
log4j.logger.org.codelutin=INFO
+log4j.logger.jaxx.runtime=DEBUG
log4j.logger.analyseplans=INFO
log4j.logger.exports=INFO
log4j.logger.formules=INFO
1
0