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

r3579 - trunk
by echatellier＠users.forge.codelutin.com Dec. 20, 2011

Dec. 20, 2011

Author: echatellier Date: 2011-12-20 11:58:54 +0100 (Tue, 20 Dec 2011) New Revision: 3579 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3579 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-20 10:58:52 UTC (rev 3578) +++ trunk/pom.xml 2011-12-20 10:58:54 UTC (rev 3579) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.1</version> + <version>4.0.0.2-SNAPSHOT</version>  <dependencies> @@ -724,9 +724,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> </scm> <repositories>

1 0

r3578 - in tags: . isis-fish-4.0.0.1
by echatellier＠users.forge.codelutin.com Dec. 20, 2011

Dec. 20, 2011

Author: echatellier Date: 2011-12-20 11:58:52 +0100 (Tue, 20 Dec 2011) New Revision: 3578 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3578 Log: [maven-release-plugin] copy for tag isis-fish-4.0.0.1 Added: tags/isis-fish-4.0.0.1/ Property changes on: tags/isis-fish-4.0.0.1 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo +

1 0

r3577 - trunk
by echatellier＠users.forge.codelutin.com Dec. 20, 2011

Dec. 20, 2011

Author: echatellier Date: 2011-12-20 11:58:48 +0100 (Tue, 20 Dec 2011) New Revision: 3577 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3577 Log: [maven-release-plugin] prepare release isis-fish-4.0.0.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-20 10:26:17 UTC (rev 3576) +++ trunk/pom.xml 2011-12-20 10:58:48 UTC (rev 3577) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.0.0.1-SNAPSHOT</version> + <version>4.0.0.1</version>  <dependencies> @@ -724,9 +724,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/trunk</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/trunk</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-4.0.0.1</url> </scm> <repositories>

1 0

r3576 - trunk
by echatellier＠users.forge.codelutin.com Dec. 20, 2011

Dec. 20, 2011

Author: echatellier Date: 2011-12-20 11:26:17 +0100 (Tue, 20 Dec 2011) New Revision: 3576 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3576 Log: #571 : Bug rendu en aire sur les graphiques Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-20 10:09:45 UTC (rev 3575) +++ trunk/pom.xml 2011-12-20 10:26:17 UTC (rev 3576) @@ -396,6 +396,13 @@ <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> + + <dependency> + <groupId>jfree</groupId> + <artifactId>jfreechart</artifactId> + <version>1.0.12</version> + <scope>runtime</scope> + </dependency> </dependencies>

1 0

r3575 - trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity
by echatellier＠users.forge.codelutin.com Dec. 20, 2011

Dec. 20, 2011

Author: echatellier Date: 2011-12-20 11:09:45 +0100 (Tue, 20 Dec 2011) New Revision: 3575 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3575 Log: #572 : Effectifs initiaux discrets non remplissables Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-12-19 16:04:02 UTC (rev 3574) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2011-12-20 10:09:45 UTC (rev 3575) @@ -502,13 +502,11 @@ int nbTab = Integer.parseInt(discreteNumber); factorWizardUI.discretComponents.clear(); factorWizardUI.getTabPane().removeAll(); - for (int i = 0; i < nbTab ; i++) { + for (int i = 1; i <= nbTab ; i++) { JComponent c = getNewDiscreteComponent(factorWizardUI); - System.out.println(c); factorWizardUI.discretComponents.add(c); - JScrollPane js = new JScrollPane(c); - String tabName = _("isisfish.sensitivity.discretevaluelabel", (i+1)); - factorWizardUI.getTabPane().addTab(tabName, js); + String tabName = _("isisfish.sensitivity.discretevaluelabel", i); + factorWizardUI.getTabPane().addTab(tabName, c); } factorWizardUI.pack(); } @@ -920,6 +918,9 @@ * Get copy of component with original entity value as default value. * Used to add new tab to a new or existing factor. * + * Le composant retourné est inclut dans un jscrollpane (sauf pour les + * matrices qui contient deja un jscrollpane) + * * @param factorWizardUI factorWizardUI * @return component copy */ @@ -982,7 +983,8 @@ MatrixContinuousPanelUI currentPanel = (MatrixContinuousPanelUI)factorWizardUI.continuousPanel; // on copie une des matrices du composant MatrixND matrix = currentPanel.getReferenceValuePanel().getMatrix().copy(); - result = new MatrixPanelEditor(matrix, false); + result = new MatrixPanelEditor(); // bug in 2.2.x with matrix in constructor + ((MatrixPanelEditor)result).setMatrix(matrix); } else if (factorPath.startsWith("parameters.rule.")) { Pattern pattern = Pattern.compile("^parameters\\.rule\\.\\d+\\.parameter\\.\\w+\\.(.+)$"); Matcher matcher = pattern.matcher(factorPath); @@ -1014,6 +1016,11 @@ log.debug("Component for path " + factorPath + " is " + result); } + // hack : si on met 2 fois un jscrollpane, rien ne s'affiche + if (!(result instanceof MatrixPanelEditor)) { + result = new JScrollPane(result); + } + return result; }

1 0

r3574 - branches/isis-fish-3.3.0.x
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 17:04:02 +0100 (Mon, 19 Dec 2011) New Revision: 3574 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3574 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/isis-fish-3.3.0.x/pom.xml Modified: branches/isis-fish-3.3.0.x/pom.xml =================================================================== --- branches/isis-fish-3.3.0.x/pom.xml 2011-12-19 16:04:00 UTC (rev 3573) +++ branches/isis-fish-3.3.0.x/pom.xml 2011-12-19 16:04:02 UTC (rev 3574) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.9</version> + <version>3.3.0.10-SNAPSHOT</version>  <dependencies> @@ -694,9 +694,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3…</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3…</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3.0.x</url> </scm> <repositories>

1 0

r3573 - in tags: . isis-fish-3.3.0.9
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 17:04:00 +0100 (Mon, 19 Dec 2011) New Revision: 3573 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3573 Log: [maven-release-plugin] copy for tag isis-fish-3.3.0.9 Added: tags/isis-fish-3.3.0.9/ Property changes on: tags/isis-fish-3.3.0.9 ___________________________________________________________________ Added: svn:ignore + maven.log target velocity.log .classpath .project isis-fish.ipr isis-fish.iws isis-fish.iml .settings bin nbproject Inputs_Langoustine Added: svn:mergeinfo +

1 0

r3572 - branches/isis-fish-3.3.0.x
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 17:03:57 +0100 (Mon, 19 Dec 2011) New Revision: 3572 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3572 Log: [maven-release-plugin] prepare release isis-fish-3.3.0.9 Modified: branches/isis-fish-3.3.0.x/pom.xml Modified: branches/isis-fish-3.3.0.x/pom.xml =================================================================== --- branches/isis-fish-3.3.0.x/pom.xml 2011-12-19 16:01:38 UTC (rev 3571) +++ branches/isis-fish-3.3.0.x/pom.xml 2011-12-19 16:03:57 UTC (rev 3572) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>3.3.0.9-SNAPSHOT</version> + <version>3.3.0.9</version>  <dependencies> @@ -694,9 +694,9 @@   <scm> - <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3…</connection> - <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3…</developerConnection> - <url>http://svn.forge.codelutin.com/svn/isis-fish/branches/isis-fish-3.3.0.x</url> + <connection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</connection> + <developerConnection>scm:svn:http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</developerConnection> + <url>http://svn.forge.codelutin.com/svn/isis-fish/tags/isis-fish-3.3.0.9</url> </scm> <repositories>

1 0

r3571 - trunk/src/main/java/fr/ifremer/isisfish/ui/input
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 17:01:38 +0100 (Mon, 19 Dec 2011) New Revision: 3571 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3571 Log: Fix species list data Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-12-19 15:37:39 UTC (rev 3570) +++ trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-12-19 16:01:38 UTC (rev 3571) @@ -65,6 +65,7 @@ setSeasonModel(); setSpecies(null); setMetierSeasonInfo(null); + setTargetSpeciesModel(); setTableTargetSpeciesModel(); } });

1 0

r3570 - branches/isis-fish-3.3.0.x/src/license
by echatellier＠users.forge.codelutin.com Dec. 19, 2011

Dec. 19, 2011

Author: echatellier Date: 2011-12-19 16:37:39 +0100 (Mon, 19 Dec 2011) New Revision: 3570 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3570 Log: Update third party Modified: branches/isis-fish-3.3.0.x/src/license/THIRD-PARTY.properties Modified: branches/isis-fish-3.3.0.x/src/license/THIRD-PARTY.properties =================================================================== --- branches/isis-fish-3.3.0.x/src/license/THIRD-PARTY.properties 2011-12-19 15:25:28 UTC (rev 3569) +++ branches/isis-fish-3.3.0.x/src/license/THIRD-PARTY.properties 2011-12-19 15:37:39 UTC (rev 3570) @@ -1,4 +1,4 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - ANTLR 3 License @@ -10,24 +10,24 @@ # - BBN Technologies # - BSD License # - BSD licence +# - BSD style # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - GNU General Public License - Version 2 -# - GNU LESSER GENERAL PUBLIC LICENSE # - GNU Lesser General Public Licence -# - GNU Lesser General Public License # - GPL # - ICU License +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - JDom license # - JGoodies license # - Java Transaction API (JTA) License # - Jaxen license -# - LGPL # - Lesser General Public License (LGPL v. 2.1) # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - License Agreement for JavaMail(TM) API # - MIT License # - Mozilla Public License 1.1 (MPL 1.1) @@ -43,36 +43,36 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jan 20 17:35:50 CET 2011 -antlr--antlr--2.7.6--jar=BSD License -aspectwerkz--aspectwerkz--2.0--jar=GNU Lesser General Public License -aspectwerkz--aspectwerkz-core--2.0--jar=GNU Lesser General Public License -aspectwerkz--aspectwerkz-jdk5--2.0--jar=GNU Lesser General Public License -com.ibm.icu--icu4j--2.6.1--jar=ICU License -com.sun--tools--1.6.0.16--jar=Sun's Binary Code License -commons-jxpath--commons-jxpath--1.3--jar=The Apache Software License, Version 2.0 -commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1--jar=BSD License -javassist--javassist--3.8.0.GA--jar=GNU Lesser General Public License -javax.activation--activation--1.1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -javax.help--javahelp--2.0.02--jar=GNU General Public License - Version 2 -javax.mail--mail--1.4.1--jar=License Agreement for JavaMail(TM) API -javax.transaction--jta--1.1--jar=Java Transaction API (JTA) License -jaxen--jaxen--1.1.1--jar=Jaxen license -jdom--jdom--1.0--jar=JDom license -jgoodies--looks--1.2.2--jar=JGoodies license -jrexx--jrexx--1.1.1--jar=Apache Software License -net.java.dev.jna--jna--3.2.2--jar=Lesser General Public License (LGPL v. 2.1) -opensymphony--ognl--2.6.11--jar=The OpenSymphony Software License, Version 1.1 -org.antlr--antlr-runtime--3.1.3--jar=ANTLR 3 License -org.nuiton.thirdparty--JRI--0.8-0--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--REngine--0.6-0--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--Rserve--0.6-0--jar=Lesser General Public License (LGPL v. 2.1) -org.nuiton.thirdparty--asm--1.5.4-snapshot--jar=ASM License -org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot--jar=ASM License -org.nuiton.thirdparty--asm-util--1.5.4-snapshot--jar=ASM License -org.nuiton.thirdparty--l2fprod-common--0.1--jar=Apache Software License -qdox--qdox--1.4--jar=Apache Software License, Version 2.0 -trove--trove--1.0.2--jar=Lesser General Public License (LGPL) -xalan--xalan--2.6.0--jar=Apache Software License Version 2.0 -xerces--xmlParserAPIs--2.6.2--jar=Apache Software License, Version 1.1 +#Mon Dec 19 16:26:39 CET 2011 +antlr--antlr--2.7.6=BSD License +aspectwerkz--aspectwerkz--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-core--2.0=GNU Lesser General Public License +aspectwerkz--aspectwerkz-jdk5--2.0=GNU Lesser General Public License +com.ibm.icu--icu4j--2.6.1=ICU License +com.sun--tools--1.6.0.16=Sun's Binary Code License +commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javassist--javassist--3.8.0.GA=GNU Lesser General Public License +javax.activation--activation--1.1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.help--javahelp--2.0.02=GNU General Public License - Version 2 +javax.mail--mail--1.4.1=License Agreement for JavaMail(TM) API +javax.transaction--jta--1.1=Java Transaction API (JTA) License +jaxen--jaxen--1.1.1=Jaxen license +jdom--jdom--1.0=JDom license +jgoodies--looks--1.2.2=JGoodies license +jrexx--jrexx--1.1.1=Apache Software License +net.java.dev.jna--jna--3.2.2=Lesser General Public License (LGPL v. 2.1) +opensymphony--ognl--2.6.11=The OpenSymphony Software License, Version 1.1 +org.antlr--antlr-runtime--3.1.3=ANTLR 3 License +org.nuiton.thirdparty--JRI--0.8-0=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--REngine--0.6-0=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--Rserve--0.6-0=Lesser General Public License (LGPL v. 2.1) +org.nuiton.thirdparty--asm--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-attrs--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--asm-util--1.5.4-snapshot=ASM License +org.nuiton.thirdparty--l2fprod-common--0.1=Apache Software License +qdox--qdox--1.4=Apache Software License, Version 2.0 +trove--trove--1.0.2=Lesser General Public License (LGPL) +xalan--xalan--2.6.0=Apache Software License Version 2.0 +xerces--xmlParserAPIs--2.6.2=Apache Software License, Version 1.1

1 0