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

r3360 - isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export
by chatellier＠users.labs.libre-entreprise.org 08 Jun '11

08 Jun '11

Author: chatellier Date: 2011-06-08 09:59:37 +0000 (Wed, 08 Jun 2011) New Revision: 3360 Log: Move log to debug Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2011-06-07 20:11:23 UTC (rev 3359) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2011-06-08 09:59:37 UTC (rev 3360) @@ -145,15 +145,18 @@ String valueString = "not initialized"; try { valueString = props.getProperty(paramTag + propName); - + // ATTENTION il semblerait que notre intance de beanUtils // soit ecrasé par celle du MatrixType ... // a ne pas deplacer avant la boucle ConvertUtilsBean beanUtils = ConverterUtil.getConverter(context); - + Object value = beanUtils.convert(valueString, type); - log.info("DEBUG: set sensitivityexport param: " + paramTag + propName - + " = " + value + "(" + valueString + ")"); + if (log.isDebugEnabled()) { + log.debug("DEBUG: set sensitivityexport param: " + paramTag + + propName + " = " + value + "(" + valueString + ")"); + } + SensitivityExportStorage.setParameterValue(export, propName, value); } catch (Exception eee) { if (log.isWarnEnabled()) {

1 0

r3359 - isis-fish/trunk
by tchemit＠users.labs.libre-entreprise.org 07 Jun '11

07 Jun '11

Author: tchemit Date: 2011-06-07 20:11:23 +0000 (Tue, 07 Jun 2011) New Revision: 3359 Log: Update mavenpom4labs to 2.5.5. Modified: isis-fish/trunk/pom.xml Modified: isis-fish/trunk/pom.xml =================================================================== --- isis-fish/trunk/pom.xml 2011-06-07 20:11:20 UTC (rev 3358) +++ isis-fish/trunk/pom.xml 2011-06-07 20:11:23 UTC (rev 3359) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3358 - isis-fish/branches/3.3.1
by tchemit＠users.labs.libre-entreprise.org 07 Jun '11

07 Jun '11

Author: tchemit Date: 2011-06-07 20:11:20 +0000 (Tue, 07 Jun 2011) New Revision: 3358 Log: Update mavenpom4labs to 2.5.5. Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-06-07 16:56:23 UTC (rev 3357) +++ isis-fish/branches/3.3.1/pom.xml 2011-06-07 20:11:20 UTC (rev 3358) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4labs</artifactId> - <version>2.5.4</version> + <version>2.5.5</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r3357 - in isis-fish/branches/3.3.1/src/test: java/fr/ifremer/isisfish resources/test-database/analyseplans resources/test-database/exports resources/test-database/rules resources/test-database/scripts resources/test-database/sensitivity resources/test-database/sensitivityexports
by chatellier＠users.labs.libre-entreprise.org 07 Jun '11

07 Jun '11

Author: chatellier Date: 2011-06-07 16:56:23 +0000 (Tue, 07 Jun 2011) New Revision: 3357 Log: Remove nuiton migration. Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -112,8 +112,6 @@ return result; } }); - - IsisFish.doNuitonMigration(); } /** Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/CalibrationSimplexePasVariable2Capturabilite.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,7 +24,7 @@ */ package analyseplans; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.io.FileReader; @@ -35,12 +35,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.util.FileUtil; -import org.codelutin.util.StringUtil; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.util.FileUtil; +import org.nuiton.util.StringUtil; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; @@ -399,7 +399,7 @@ exportHisto += experiences.getExperience(number).q1 + ";" + experiences.getExperience(number).q2 + ";" + experiences.getExperience(number).criteria + "\n"; - org.codelutin.util.FileUtil.writeString(exportHistoric, exportHisto); + org.nuiton.util.FileUtil.writeString(exportHistoric, exportHisto); return doNext; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/analyseplans/SimulationNumberRestriction.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,7 +24,7 @@ */ package analyseplans; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Abundances.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -29,8 +29,8 @@ import java.io.Writer; -import static org.codelutin.i18n.I18n._; -import org.codelutin.math.matrix.*; +import static org.nuiton.i18n.I18n._; +import org.nuiton.math.matrix.*; import scripts.ResultName; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/Biomasses.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.Writer; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import scripts.ResultName; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesNombre.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CapturesPoids.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/CellsDefinition.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; +import org.nuiton.topia.TopiaContext; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.entities.Cell; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/EffortsMetier.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.Writer; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import scripts.ResultName; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/MetierZone.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -29,8 +29,8 @@ import java.io.Writer; -import static org.codelutin.i18n.I18n._; -import org.codelutin.math.matrix.*; +import static org.nuiton.i18n.I18n._; +import org.nuiton.math.matrix.*; import scripts.ResultName; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/NonActivite.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.Writer; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import scripts.ResultName; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/OwnerMargin.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.Writer; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import scripts.ResultName; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RegionDefinition.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -29,8 +29,8 @@ import java.io.Writer; -import static org.codelutin.i18n.I18n._; -import org.codelutin.topia.TopiaContext; +import static org.nuiton.i18n.I18n._; +import org.nuiton.topia.TopiaContext; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsNombre.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/RejetsPoids.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/VesselMargin.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package exports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.io.Writer; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import scripts.ResultName; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/exports/ZonesDefinition.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -30,8 +30,8 @@ import java.io.Writer; import java.util.List; -import static org.codelutin.i18n.I18n._; -import org.codelutin.topia.TopiaContext; +import static org.nuiton.i18n.I18n._; +import org.nuiton.topia.TopiaContext; import fr.ifremer.isisfish.entities.*; import fr.ifremer.isisfish.export.Export; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/Cantonnement.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,7 +24,7 @@ */ package rules; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +38,7 @@ import java.util.Iterator; import java.util.List; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.simulator.MetierMonitor; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/CantonnementPreSimu.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,8 +24,8 @@ */ package rules; -import static org.codelutin.i18n.I18n.n_; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.simulator.MetierMonitor; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,7 +24,7 @@ */ package rules; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.ArrayList; import java.util.List; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/EffortReduction.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,7 +24,7 @@ */ package rules; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/GraviteVPUE1.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,7 +24,7 @@ */ package rules; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,7 +36,7 @@ import java.util.List; import java.util.Collection; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import fr.ifremer.isisfish.simulator.SimulationContext; import fr.ifremer.isisfish.types.Date; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEngin.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,7 +24,7 @@ */ package rules; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,7 +36,7 @@ import java.util.Iterator; import java.util.List; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import fr.ifremer.isisfish.simulator.MetierMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; @@ -229,7 +229,7 @@ MetiersInterdits.put(new Chaine(p.metier.getNom(),true)); //récupère toutes les stratégies pratiquant le métier et pour lesquelles la proportion !=0 -var ListeStrat=new Packages.org.codelutin.dbobject.DBCollection(StrategyFactory); +var ListeStrat=new Packages.org.nuiton.dbobject.DBCollection(StrategyFactory); var Vessels=SetOfVesselsFactory.findAllByRegion(p.metier.getRegion()); for (var ves=0; ves<Vessels.size();ves++){ if (Vessels.get(ves).getMetiers().contains(p.metier)){ Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,8 +24,8 @@ */ package rules; -import static org.codelutin.i18n.I18n._; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -38,7 +38,7 @@ import java.util.List; import java.util.Map; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import fr.ifremer.isisfish.simulator.MetierMonitor; import fr.ifremer.isisfish.simulator.SimulationContext; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TACpoids.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,15 +24,15 @@ */ package rules; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.HashSet; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import scripts.RuleUtil; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TailleMin.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package rules; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import scripts.SiMatrix; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/rules/TotalClosure.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,13 +24,13 @@ */ package rules; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import scripts.SiMatrix; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/GravityModel.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -25,17 +25,17 @@ package scripts; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n_; import java.util.Collection; import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaException; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.StorageException; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/ResultName.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -37,7 +37,7 @@ package scripts; -import static org.codelutin.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n_; import fr.ifremer.isisfish.util.Doc; // pour pouvoir afficher une aide contextuelle (BUG#1605) Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/scripts/RuleUtil.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.*; +import org.nuiton.math.matrix.*; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationGroup; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorJavaExpandGrid.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -30,9 +30,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RProxy; -import org.codelutin.util.FileUtil; +import org.nuiton.j2r.REngine; +import org.nuiton.j2r.RProxy; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFast.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -37,12 +37,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RException; -import org.codelutin.j2r.RProxy; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.util.FileUtil; +import org.nuiton.j2r.REngine; +import org.nuiton.j2r.RException; +import org.nuiton.j2r.RProxy; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.util.FileUtil; import org.rosuda.JRI.REXP; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRFrF2.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -30,12 +30,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RException; -import org.codelutin.j2r.RProxy; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.util.FileUtil; +import org.nuiton.j2r.REngine; +import org.nuiton.j2r.RException; +import org.nuiton.j2r.RProxy; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRMorris.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -36,12 +36,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RException; -import org.codelutin.j2r.RProxy; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.util.FileUtil; +import org.nuiton.j2r.REngine; +import org.nuiton.j2r.RException; +import org.nuiton.j2r.RProxy; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorROptimumLHS.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -36,11 +36,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RProxy; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.util.FileUtil; +import org.nuiton.j2r.REngine; +import org.nuiton.j2r.RProxy; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRRandomLHS.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -36,11 +36,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RProxy; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.util.FileUtil; +import org.nuiton.j2r.REngine; +import org.nuiton.j2r.RProxy; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRSobol.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -37,11 +37,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RProxy; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.util.FileUtil; +import org.nuiton.j2r.REngine; +import org.nuiton.j2r.RProxy; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.util.FileUtil; import org.rosuda.JRI.REXP; import fr.ifremer.isisfish.datastore.SimulationStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivity/SensitivityCalculatorRegularFractions.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -35,12 +35,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.j2r.REngine; -import org.codelutin.j2r.RException; -import org.codelutin.j2r.RProxy; -import org.codelutin.math.matrix.MatrixFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.util.FileUtil; +import org.nuiton.j2r.REngine; +import org.nuiton.j2r.RException; +import org.nuiton.j2r.RProxy; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.simulator.SimulationParameter; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,13 +24,13 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,13 +24,13 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightReferenceY7.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeReferenceY10.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightRelativeY4.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,13 +24,13 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityCapturesWeightY1.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,13 +24,13 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassReferenceY8.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,15 +24,15 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeReferenceY11.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,15 +24,15 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; -import org.codelutin.topia.TopiaContext; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.topia.TopiaContext; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassRelativeY5.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage; Modified: isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java =================================================================== --- isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java 2011-06-07 16:44:33 UTC (rev 3356) +++ isis-fish/branches/3.3.1/src/test/resources/test-database/sensitivityexports/SensitivityGenitorBiomassY2.java 2011-06-07 16:56:23 UTC (rev 3357) @@ -24,14 +24,14 @@ */ package sensitivityexports; -import static org.codelutin.i18n.I18n._; +import static org.nuiton.i18n.I18n._; import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.codelutin.math.matrix.MatrixIterator; -import org.codelutin.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; import scripts.ResultName; import fr.ifremer.isisfish.datastore.ResultStorage;

1 0

r3356 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/mexico/xml main/java/fr/ifremer/isisfish/simulator/sensitivity/domain test/java/fr/ifremer/isisfish/mexico test/java/fr/ifremer/isisfish/simulator/launcher test/java/fr/ifremer/isisfish/simulator/sensitivity test/java/fr/ifremer/isisfish/ui/sensitivity
by jcouteau＠users.labs.libre-entreprise.org 07 Jun '11

07 Jun '11

Author: jcouteau Date: 2011-06-07 16:44:33 +0000 (Tue, 07 Jun 2011) New Revision: 3356 Log: Fix almost all tests, still one test fail on matrix equality Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-07 14:08:23 UTC (rev 3355) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2011-06-07 16:44:33 UTC (rev 3356) @@ -166,6 +166,7 @@ Element matrixElement = fixedElement.element(MX); MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext); mdomain.setReferenceValue(matrix); + mdomain.setPercentageType(true); domain = mdomain; } @@ -178,6 +179,7 @@ Element equationElement = fixedElement.element(EQUATION); edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue(REFERENCE))); edomain.setVariableName(equationElement.attributeValue(VARIABLE)); + edomain.setPercentageType(true); domain = edomain; } @@ -189,6 +191,7 @@ if (percentageElement != null) { domain.setCoefficient(Double.valueOf(percentageElement.attributeValue(COEFFICIENT))); domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue(REFERENCE))); + domain.setPercentageType(true); } else { // <range max="1.0" min="0.0"/> @@ -232,6 +235,7 @@ Element matrixElement = fixedElement.element(MX); MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext); mdomain.setReferenceValue(matrix); + mdomain.setPercentageType(true); domain = mdomain; } @@ -246,6 +250,7 @@ Element equationElement = fixedElement.element(EQUATION); edomain.setReferenceValue(Double.valueOf(equationElement.attributeValue(REFERENCE))); edomain.setVariableName(equationElement.attributeValue(VARIABLE)); + edomain.setPercentageType(true); domain = edomain; } @@ -257,6 +262,7 @@ if (percentageElement != null) { domain.setCoefficient(Double.valueOf(percentageElement.attributeValue(COEFFICIENT))); domain.setReferenceValue(Double.valueOf(percentageElement.attributeValue(REFERENCE))); + domain.setPercentageType(true); } else { // <range max="1" min="3"/> @@ -358,6 +364,7 @@ Element matrixElement = referenceElement.element(MX); MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext); mdomain.setReferenceValue(matrix); + mdomain.setPercentageType(true); } else { Element rangeElement = fixedElement.element(RANGE); @@ -379,6 +386,7 @@ if (referenceElement != null) { edomain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT))); edomain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim())); + edomain.setPercentageType(true); } else { Element rangeElement = fixedElement.element(RANGE); @@ -398,6 +406,7 @@ if (referenceElement != null) { domain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT))); domain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim())); + domain.setPercentageType(true); } else { // <range max="1.0" min="0.0"/> @@ -430,7 +439,7 @@ factor.setPath(path); Element fixedElement = factorElement.element(DOMAIN).element(FIXED); if (CONTINUOUS.equals(property)) { - ContinuousDomain domain = null; + ContinuousDomain domain; if(property.equals(MATRIXCONTINUOUS)) { @@ -444,6 +453,7 @@ Element matrixElement = referenceElement.element(MX); MatrixND matrix = MexicoHelper.getMatrixFromXml(matrixElement, topiaContext); mdomain.setReferenceValue(matrix); + mdomain.setPercentageType(true); } else { Element rangeElement = fixedElement.element(RANGE); @@ -465,6 +475,7 @@ if (referenceElement != null) { edomain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT))); edomain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim())); + edomain.setPercentageType(true); } else { Element rangeElement = fixedElement.element(RANGE); @@ -484,6 +495,7 @@ if (referenceElement != null) { domain.setCoefficient(Double.valueOf(referenceElement.attributeValue(COEFFICIENT))); domain.setReferenceValue(Double.valueOf(referenceElement.getTextTrim())); + domain.setPercentageType(true); } else { // <range max="1.0" min="0.0"/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-06-07 14:08:23 UTC (rev 3355) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2011-06-07 16:44:33 UTC (rev 3356) @@ -110,15 +110,9 @@ */ public Object getMinBound() { if (isPercentageType()) { - MatrixND temp = ((MatrixND) getReferenceValue()).copy(); - // since 3.4.0.0, operator is always * - temp.map(new MapFunction() { - public double apply(double val) { - return (val + ((val * coefficient) * ((2 * getCalculatorMinBound() - 1)))); - } - }); - return temp; + return ((Double)referenceValue + (((Double)referenceValue * coefficient) * ((2 * getCalculatorMinBound() - 1)))); + } else { return minBound; } @@ -150,16 +144,9 @@ */ public Object getMaxBound() { if (isPercentageType()) { - MatrixND temp = ((MatrixND) getReferenceValue()).copy(); - - // since 3.4.0.0, operator is always * - temp.map(new MapFunction() { - public double apply(double val) { - return (val + ((val * coefficient) * - ((2 * getCalculatorMaxBound() - 1)))); - } - }); - return temp; + return ((Double) referenceValue + + (((Double) referenceValue * coefficient) + * ((2 * getCalculatorMaxBound() - 1)))); } else { return maxBound; } @@ -224,9 +211,17 @@ * {@inheritDoc}. */ public Object getValueForIdentifier(Object identifier) { + + Double result; + + if (isPercentageType()) { // since 3.4.0.0, operator is always * - Double result = ((Double)referenceValue + (((Double)referenceValue * coefficient) + result = ((Double)referenceValue + (((Double)referenceValue * coefficient) * ((2 * (Double)identifier - 1)))); + } else { + result = ((Double)identifier * ((Double)maxBound - (Double)minBound)) + + (Double)minBound; + } return result; } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 14:08:23 UTC (rev 3355) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 16:44:33 UTC (rev 3356) @@ -149,6 +149,7 @@ MatrixContinuousDomain domain4 = new MatrixContinuousDomain(); domain4.setCoefficient(0.799); domain4.setReferenceValue(matrix1); + domain4.setPercentageType(true); factorMatrixContinuous.setDomain(domain4); factorMatrixContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); @@ -158,6 +159,7 @@ domain5.setCoefficient(0.1); domain5.setReferenceValue(45.0); domain5.setVariableName("L1"); + domain5.setPercentageType(true); factorEquationContinuous.setDomain(domain5); factorEquationContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#maxLength"); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-06-07 14:08:23 UTC (rev 3355) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2011-06-07 16:44:33 UTC (rev 3356) @@ -231,18 +231,18 @@ * @throws TopiaException */ @Test - public void testFactorPreScriptFactorInt() throws StorageException, TopiaException { + public void testFactorPreScriptFactor() throws StorageException, TopiaException { // factor - Factor factor = new Factor("testint"); + Factor factor = new Factor("test"); ContinuousDomain domain = new ContinuousDomain(); domain.setMinBound(0.0); domain.setMaxBound(50.0); factor.setDomain(domain); factor.setPath("fr.ifremer.entities.Cell#1234567890#length"); - factor.setValueForIdentifier(49); + factor.setValueForIdentifier(0.5); - Assert.assertEquals((Integer)49, factor.getValue()); + Assert.assertEquals(25.0, factor.getValue()); // scenario Scenario scenario = new Scenario(); @@ -252,7 +252,7 @@ SimulationService service = SimulationService.getService(); String scriptContent = service.generatePreScript(scenario); - Assert.assertTrue(scriptContent.contains("java.lang.Integer")); + Assert.assertTrue(scriptContent.contains("java.lang.Double")); Assert.assertTrue(scriptContent.contains("db.findByTopiaId(\"fr.ifremer.entities.Cell#1234567890\")")); Assert.assertTrue(scriptContent.contains("BeanUtils.setProperty(entity0, \"length\"")); } @@ -333,6 +333,7 @@ domain1.setReferenceValue(10.0); domain1.setCoefficient(0.1); domain1.setVariableName("K1"); + domain1.setPercentageType(true); factorEquation.setDomain(domain1); factorEquation.setPath("fr.ifremer.equation1#testFactorPreScriptEquation"); factorEquation.setValueForIdentifier(0.4); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 14:08:23 UTC (rev 3355) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 16:44:33 UTC (rev 3356) @@ -68,9 +68,9 @@ domain.setMaxBound(50.0); factor.setDomain(domain); factor.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - factor.setValueForIdentifier(49); + factor.setValueForIdentifier(0.5); - Assert.assertEquals(49, factor.getValue()); + Assert.assertEquals(25.0, factor.getValue()); if (log.isInfoEnabled()) { log.info("factor#toString() = " + factor); @@ -148,6 +148,26 @@ matrix1.setValue(new int[] { 2, 0 }, 3); matrix1.setValue(new int[] { 2, 1 }, -1); + // matrix minBound + MatrixND minBound = MatrixFactory.getInstance().create("test1", + new int[]{3, 2}, new String[]{"col1", "col2"}); + minBound.setValue(new int[]{0, 0}, 0.9); + minBound.setValue(new int[]{0, 1}, -15.4); + minBound.setValue(new int[]{1, 0}, 18.9); + minBound.setValue(new int[]{1, 1}, 1.8); + minBound.setValue(new int[]{2, 0}, 2.7); + minBound.setValue(new int[]{2, 1}, -1.1); + + // matrix maxBound + MatrixND maxBound = MatrixFactory.getInstance().create("test1", + new int[]{3, 2}, new String[]{"col1", "col2"}); + maxBound.setValue(new int[]{0, 0}, 1.1); + maxBound.setValue(new int[]{0, 1}, -12.6); + maxBound.setValue(new int[]{1, 0}, 23.1); + maxBound.setValue(new int[]{1, 1}, 2.2); + maxBound.setValue(new int[]{2, 0}, 3.3); + maxBound.setValue(new int[]{2, 1}, -0.9); + // factor Factor factor = new Factor("testmatrix"); MatrixContinuousDomain domain = new MatrixContinuousDomain (); @@ -159,8 +179,8 @@ Assert.assertEquals(0.92, ((MatrixND)factor.getValue()).getValue(new int[] { 0, 0 }),0.0000001); Assert.assertEquals(2.76, ((MatrixND)factor.getValue()).getValue(new int[] { 2, 0 }),0.0000001); - Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); - Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + Assert.assertTrue(minBound.equalsValues((MatrixND)((ContinuousDomain)factor.getDomain()).getMinBound())); + Assert.assertTrue(maxBound.equalsValues((MatrixND)((ContinuousDomain)factor.getDomain()).getMaxBound())); Assert.assertEquals(0.1, (Double)factor.getDisplayedValue(),0); // matrix 2 @@ -254,14 +274,14 @@ domain.setCoefficient(0.1); domain.setVariableName("Linf"); domain.setReferenceValue(3.0); + domain.setPercentageType(true); factor.setDomain(domain); factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor.setValueForIdentifier(0.1); Assert.assertEquals(2.76, (Double)factor.getValue(),0.0000001); - Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); - Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); - Assert.assertEquals(0.1, (Double)factor.getValue(),0); + Assert.assertEquals(2.7,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(3.3,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); // factor 2 Factor factor2 = new Factor("testequation"); @@ -269,13 +289,14 @@ domain2.setCoefficient(0.1); domain2.setVariableName("Linf"); domain2.setReferenceValue(3.0); + domain2.setPercentageType(true); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor2.setValueForIdentifier(0.1); Assert.assertEquals(2.76, (Double)factor2.getValue(),0.0000001); - Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); - Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + Assert.assertEquals(2.7,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(3.3,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); // factor 3 Factor factor3 = new Factor("testequation"); @@ -283,13 +304,14 @@ domain3.setCoefficient(0.1); domain3.setVariableName("Linf"); domain3.setReferenceValue(3.0); + domain3.setPercentageType(true); factor3.setDomain(domain3); factor3.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor3.setValueForIdentifier(0.2); Assert.assertEquals(2.82, (Double)factor3.getValue(),0.0000001); - Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); - Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + Assert.assertEquals(2.7,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(3.3,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); // factor 4 Factor factor4 = new Factor("testequation"); @@ -297,13 +319,14 @@ domain4.setCoefficient(0.05); domain4.setVariableName("Linf"); domain4.setReferenceValue(3.0); + domain4.setPercentageType(true); factor4.setDomain(domain4); factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); factor4.setValueForIdentifier(0.1); Assert.assertEquals(2.88, (Double)factor4.getValue(),0.0000001); - Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); - Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); + Assert.assertEquals(2.7,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); + Assert.assertEquals(3.3,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); if (log.isInfoEnabled()) { log.info("factor#toString() = " + factor); @@ -352,13 +375,14 @@ Factor factor = new Factor("testclone"); factor.setPath("fr.ifremer.isisfish.entities.Cell#lenght"); factor.setComment("answer to life"); - factor.setValue(42.0); ContinuousDomain domain = new ContinuousDomain(); domain.setMinBound(0.0); domain.setMaxBound(50.0); factor.setDomain(domain); + factor.setValueForIdentifier(0.84); + // clone Factor clone = (Factor)factor.clone(); @@ -368,6 +392,6 @@ Assert.assertEquals("answer to life", clone.getComment()); Assert.assertEquals(42.0, clone.getValue()); Assert.assertNotSame(domain, clone.getDomain()); - Assert.assertEquals("id1", clone.getDomain().getValueForIdentifier("id1")); + Assert.assertEquals(42.0, clone.getDomain().getValueForIdentifier(0.84)); } } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2011-06-07 14:08:23 UTC (rev 3355) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2011-06-07 16:44:33 UTC (rev 3356) @@ -77,7 +77,7 @@ domain1.setMaxBound(50.0); factor1.setDomain(domain1); factor1.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); - factor1.setValueForIdentifier(49); + factor1.setValueForIdentifier(0.5); // matrix 1 MatrixND matrix1 = MatrixFactory.getInstance().create("test1",

1 0

r3355 - in isis-fish/branches/3.3.1/src: main/resources test/java/fr/ifremer/isisfish/mexico test/java/fr/ifremer/isisfish/simulator/sensitivity test/java/fr/ifremer/isisfish/simulator/sensitivity/domain
by jcouteau＠users.labs.libre-entreprise.org 07 Jun '11

07 Jun '11

Author: jcouteau Date: 2011-06-07 14:08:23 +0000 (Tue, 07 Jun 2011) New Revision: 3355 Log: Fix test compilation Modified: isis-fish/branches/3.3.1/src/main/resources/log4j.properties isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java Modified: isis-fish/branches/3.3.1/src/main/resources/log4j.properties =================================================================== --- isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/main/resources/log4j.properties 2011-06-07 14:08:23 UTC (rev 3355) @@ -31,6 +31,7 @@ # package level log4j.logger.fr.ifremer.isisfish=INFO +log4j.logger.org.nuiton.j2r=DEBUG log4j.logger.org.nuiton=WARN log4j.logger.analyseplans=INFO log4j.logger.exports=INFO Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2011-06-07 14:08:23 UTC (rev 3355) @@ -148,7 +148,7 @@ Factor factorMatrixContinuous = new Factor("factor 4 (MatrixContinuous)"); MatrixContinuousDomain domain4 = new MatrixContinuousDomain(); domain4.setCoefficient(0.799); - domain4.setMatrix(matrix1); + domain4.setReferenceValue(matrix1); factorMatrixContinuous.setDomain(domain4); factorMatrixContinuous.setPath("fr.ifremer.isisfish.entities.PopulationGroup#1156461521076#0.6526656643346673#minLength"); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2011-06-07 14:08:23 UTC (rev 3355) @@ -70,7 +70,7 @@ factor.setPath("org.nuiton.factor#1234567890#0.12242345354#name"); factor.setValueForIdentifier(49); - Assert.assertEquals((Integer) 49, factor.getValue()); + Assert.assertEquals(49, factor.getValue()); if (log.isInfoEnabled()) { log.info("factor#toString() = " + factor); @@ -151,7 +151,7 @@ // factor Factor factor = new Factor("testmatrix"); MatrixContinuousDomain domain = new MatrixContinuousDomain (); - domain.setMatrix(matrix1); + domain.setReferenceValue(matrix1); domain.setCoefficient(0.1); factor.setDomain(domain); factor.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); @@ -161,7 +161,7 @@ Assert.assertEquals(2.76, ((MatrixND)factor.getValue()).getValue(new int[] { 2, 0 }),0.0000001); Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); - Assert.assertEquals(0.1, ((MatrixContinuousDomain)factor.getDomain()).getValue(),0); + Assert.assertEquals(0.1, (Double)factor.getDisplayedValue(),0); // matrix 2 MatrixND matrix2 = MatrixFactory.getInstance().create("test1", @@ -176,7 +176,7 @@ // factor 2 Factor factor2 = new Factor("testmatrix"); MatrixContinuousDomain domain2 = new MatrixContinuousDomain(); - domain2.setMatrix(matrix2); + domain2.setReferenceValue(matrix2); domain2.setCoefficient(0.1); factor2.setDomain(domain2); factor2.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); @@ -200,7 +200,7 @@ // factor 3 Factor factor3 = new Factor("testmatrix"); MatrixContinuousDomain domain3 = new MatrixContinuousDomain(); - domain3.setMatrix(matrix3); + domain3.setReferenceValue(matrix3); domain3.setCoefficient(0.2); factor3.setDomain(domain3); factor3.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); @@ -224,7 +224,7 @@ // factor 3 Factor factor4 = new Factor("testmatrix"); MatrixContinuousDomain domain4 = new MatrixContinuousDomain(); - domain4.setMatrix(matrix4); + domain4.setReferenceValue(matrix4); domain4.setCoefficient(0.3); factor4.setDomain(domain4); factor4.setPath("org.nuiton.math.matrix.MatrixND#563456293453#2.456347646#dim"); @@ -261,7 +261,7 @@ Assert.assertEquals(2.76, (Double)factor.getValue(),0.0000001); Assert.assertEquals(0,(Double)((ContinuousDomain)factor.getDomain()).getMinBound(),0); Assert.assertEquals(1,(Double)((ContinuousDomain)factor.getDomain()).getMaxBound(),0); - Assert.assertEquals(0.1, ((EquationContinuousDomain)factor.getDomain()).getValue(),0); + Assert.assertEquals(0.1, (Double)factor.getValue(),0); // factor 2 Factor factor2 = new Factor("testequation"); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationContinuousDomainTest.java 2011-06-07 14:08:23 UTC (rev 3355) @@ -54,7 +54,6 @@ domain.setVariableName("varname"); domain.setCoefficient(0.05); domain.setReferenceValue(90.0); - domain.setValue(89.5); // clone EquationContinuousDomain clone = domain.clone(); @@ -66,6 +65,5 @@ Assert.assertEquals("varname", clone.getVariableName()); Assert.assertEquals(0.05, clone.getCoefficient()); Assert.assertEquals(90.0, clone.getReferenceValue()); - Assert.assertEquals(89.5, clone.getValue()); } } Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java 2011-06-07 09:19:29 UTC (rev 3354) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/domain/MatrixContinuousDomainTest.java 2011-06-07 14:08:23 UTC (rev 3355) @@ -58,9 +58,8 @@ domain.setMaxBound(0.74); domain.setCardinality(5); // child - domain.setMatrix(matrix); + domain.setReferenceValue(matrix); domain.setCoefficient(0.05); - domain.setValue(89.5); // clone MatrixContinuousDomain clone = domain.clone(); @@ -69,8 +68,7 @@ Assert.assertEquals(0.55, clone.minBound); // getter return 0.0 Assert.assertEquals(0.74, clone.maxBound); // getter return 1.0 Assert.assertEquals(5, clone.getCardinality()); - Assert.assertEquals(matrix, clone.getMatrix()); + Assert.assertEquals(matrix, clone.getReferenceValue()); Assert.assertEquals(0.05, clone.getCoefficient()); - Assert.assertEquals(89.5, clone.getValue()); } }

1 0

r3354 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui: . config input queue script sensitivity simulator simulator/filter vcs widget/filter
by chatellier＠users.labs.libre-entreprise.org 07 Jun '11

07 Jun '11

Author: chatellier Date: 2011-06-07 09:19:29 +0000 (Tue, 07 Jun 2011) New Revision: 3354 Log: Fix tab char Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,9 +24,9 @@ --> <JPanel layout='{new BorderLayout()}' abstract="true"> <import> - fr.ifremer.isisfish.ui.simulator.SimulAction; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.ui.simulator.SimulAction; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; javax.swing.JFileChooser java.io.File </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,10 +24,10 @@ --> <JPanel layout='{new BorderLayout()}'> <import> - fr.ifremer.isisfish.ui.simulator.SimulAction - jaxx.runtime.context.JAXXInitialContext - fr.ifremer.isisfish.ui.input.InputAction - fr.ifremer.isisfish.ui.input.InputSaveVerifier + fr.ifremer.isisfish.ui.simulator.SimulAction + jaxx.runtime.context.JAXXInitialContext + fr.ifremer.isisfish.ui.input.InputAction + fr.ifremer.isisfish.ui.input.InputSaveVerifier fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier javax.swing.ImageIcon </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -33,7 +33,7 @@ // fill default values getAction().resetSSHConfiguration(); - ]]></script> + ]]></script> <Table border='{BorderFactory.createTitledBorder(_("isisfish.simulator.ssh.configuration.connection"))}' fill='horizontal'> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -31,13 +31,13 @@ <import> java.util.ArrayList; - fr.ifremer.isisfish.entities.EffortDescription; - fr.ifremer.isisfish.entities.SetOfVessels; - fr.ifremer.isisfish.types.TimeUnit; - fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel; - fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.EffortDescription; + fr.ifremer.isisfish.entities.SetOfVessels; + fr.ifremer.isisfish.types.TimeUnit; + fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel; + fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <BeanValidator id='validator' context="effortdescriptionparameters" Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,16 +28,16 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> <import> - java.util.ArrayList; - fr.ifremer.isisfish.entities.EffortDescription; - fr.ifremer.isisfish.entities.SetOfVessels; - fr.ifremer.isisfish.entities.Metier; - fr.ifremer.isisfish.ui.input.model.MetierListModel; - fr.ifremer.isisfish.ui.input.renderer.MetierListRenderer; - fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel; - fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + java.util.ArrayList; + fr.ifremer.isisfish.entities.EffortDescription; + fr.ifremer.isisfish.entities.SetOfVessels; + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.ui.input.model.MetierListModel; + fr.ifremer.isisfish.ui.input.renderer.MetierListRenderer; + fr.ifremer.isisfish.ui.input.model.EffortDescriptionListModel; + fr.ifremer.isisfish.ui.input.renderer.EffortDescriptionListRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <BeanValidator id='validator' context="effortdescription" Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,16 +29,16 @@ <Boolean id="resultOk" javaBean="false" /> <import> - fr.ifremer.isisfish.util.CompileHelper; - fr.ifremer.isisfish.util.EvaluatorHelper; - org.nuiton.util.FileUtil; - javax.swing.text.html.HTMLEditorKit; - javax.swing.text.html.HTMLDocument; - javax.swing.event.HyperlinkListener; - javax.swing.text.html.HTMLFrameHyperlinkEvent; - javax.swing.event.HyperlinkEvent; - java.io.PrintWriter; - java.io.StringWriter; + fr.ifremer.isisfish.util.CompileHelper; + fr.ifremer.isisfish.util.EvaluatorHelper; + org.nuiton.util.FileUtil; + javax.swing.text.html.HTMLEditorKit; + javax.swing.text.html.HTMLDocument; + javax.swing.event.HyperlinkListener; + javax.swing.text.html.HTMLFrameHyperlinkEvent; + javax.swing.event.HyperlinkEvent; + java.io.PrintWriter; + java.io.StringWriter; java.awt.Color java.awt.Desktop </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,12 +29,12 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.entities.FisheryRegion; - fr.ifremer.isisfish.map.CopyMapToClipboardListener; - com.bbn.openmap.gui.Tool; - com.bbn.openmap.gui.OMToolSet; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.FisheryRegion; + fr.ifremer.isisfish.map.CopyMapToClipboardListener; + com.bbn.openmap.gui.Tool; + com.bbn.openmap.gui.OMToolSet; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; javax.swing.DefaultListModel </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,8 +28,8 @@ <import> static org.nuiton.i18n.I18n.n_ - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -61,14 +61,14 @@ <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id='errorsTableModel' /> --> <import> - javax.swing.JComponent - javax.swing.event.ChangeListener - fr.ifremer.isisfish.entities.FisheryRegion - fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils - fr.ifremer.isisfish.ui.WelcomePanelUI - org.nuiton.topia.persistence.TopiaEntityContextable - org.nuiton.topia.TopiaContext - org.apache.commons.lang.StringUtils + javax.swing.JComponent + javax.swing.event.ChangeListener + fr.ifremer.isisfish.entities.FisheryRegion + fr.ifremer.isisfish.ui.sensitivity.SensitivityUtils + fr.ifremer.isisfish.ui.WelcomePanelUI + org.nuiton.topia.persistence.TopiaEntityContextable + org.nuiton.topia.TopiaContext + org.apache.commons.lang.StringUtils java.awt.Color javax.swing.AbstractAction javax.swing.JTable Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -43,17 +43,17 @@ <Boolean id="autoSaveModification" javaBean="true" /> <import> - java.lang.reflect.Method; - java.io.File; - fr.ifremer.isisfish.entities.Formule; - fr.ifremer.isisfish.entities.Equation; - fr.ifremer.isisfish.ui.input.formule.FormuleComboModel; - org.apache.commons.lang.StringUtils; - org.nuiton.topia.TopiaContext; - javax.swing.event.DocumentListener; + java.lang.reflect.Method; + java.io.File; + fr.ifremer.isisfish.entities.Formule; + fr.ifremer.isisfish.entities.Equation; + fr.ifremer.isisfish.ui.input.formule.FormuleComboModel; + org.apache.commons.lang.StringUtils; + org.nuiton.topia.TopiaContext; + javax.swing.event.DocumentListener; javax.swing.event.DocumentEvent - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; java.io.IOException javax.swing.DefaultComboBoxModel </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -32,8 +32,8 @@ <fr.ifremer.isisfish.entities.Species id='species' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.MetierSeasonInfo; - fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; + fr.ifremer.isisfish.entities.MetierSeasonInfo; + fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; fr.ifremer.isisfish.entities.Equation; fr.ifremer.isisfish.entities.Metier; fr.ifremer.isisfish.entities.Species; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -30,16 +30,16 @@ <fr.ifremer.isisfish.entities.MetierSeasonInfo id='metierSeasonInfo' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Metier; - fr.ifremer.isisfish.entities.MetierSeasonInfo; - fr.ifremer.isisfish.entities.Zone; - fr.ifremer.isisfish.types.Month; - fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; + fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.MetierSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + fr.ifremer.isisfish.types.Month; + fr.ifremer.isisfish.ui.input.model.MetierSeasonInfoComboModel; fr.ifremer.isisfish.ui.input.model.ZoneListModel; - fr.ifremer.isisfish.ui.widget.Interval; - fr.ifremer.isisfish.ui.widget.IntervalPanel; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.ui.widget.Interval; + fr.ifremer.isisfish.ui.widget.IntervalPanel; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; java.util.ArrayList java.awt.Dimension </import> @@ -103,7 +103,7 @@ } protected void create() { - MetierSeasonInfo newMSI = getContextValue(InputAction.class).createMetierSeasonInfo(getBean()); + MetierSeasonInfo newMSI = getContextValue(InputAction.class).createMetierSeasonInfo(getBean()); setMetierSeasonInfo(newMSI); setMetierSeasonInfoCombo(); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,11 +28,11 @@ <fr.ifremer.isisfish.entities.Metier id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Gear; - fr.ifremer.isisfish.entities.Metier; + fr.ifremer.isisfish.entities.Gear; + fr.ifremer.isisfish.entities.Metier; fr.ifremer.isisfish.ui.input.model.GearComboModel; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; java.awt.Dimension </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,12 +28,12 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Species; - fr.ifremer.isisfish.entities.PopulationGroup; - fr.ifremer.isisfish.entities.Population; - javax.swing.table.DefaultTableModel; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.Species; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.Population; + javax.swing.table.DefaultTableModel; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; javax.swing.JOptionPane javax.swing.JFrame java.awt.BorderLayout Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,11 +28,11 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Population; - org.nuiton.math.matrix.gui.MatrixPanelEvent; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; - org.nuiton.math.matrix.gui.MatrixPanelListener; + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; </import> <BeanValidator id='validator' context="capturability" Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,7 +28,7 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.Population; </import> <BeanValidator id='validator' context="equation" Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -40,11 +40,11 @@ <fr.ifremer.isisfish.entities.PopulationGroup id='populationGroup' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.PopulationGroup; - fr.ifremer.isisfish.entities.Population; - org.nuiton.math.matrix.MatrixND; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.MatrixND; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <BeanValidator id='validator' context="group" Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -33,15 +33,15 @@ <Boolean id='coefNonVide' javaBean='false'/> <import> - fr.ifremer.isisfish.entities.Population; - fr.ifremer.isisfish.entities.PopulationGroup; - fr.ifremer.isisfish.entities.PopulationSeasonInfo; - fr.ifremer.isisfish.entities.Zone; - org.nuiton.math.matrix.MatrixND; - org.nuiton.math.matrix.gui.MatrixPanelEvent; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; - org.nuiton.math.matrix.gui.MatrixPanelListener; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; </import> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -30,8 +30,8 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.PopulationSeasonInfo; - fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; </import> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -33,15 +33,15 @@ <Boolean id='coefNonVide' javaBean='false'/> <import> - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; - fr.ifremer.isisfish.entities.Population; - fr.ifremer.isisfish.entities.PopulationGroup; - fr.ifremer.isisfish.entities.PopulationSeasonInfo; - fr.ifremer.isisfish.entities.Zone; - org.nuiton.math.matrix.MatrixND; - org.nuiton.math.matrix.gui.MatrixPanelEvent; - org.nuiton.math.matrix.gui.MatrixPanelListener; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + org.nuiton.math.matrix.gui.MatrixPanelListener; </import> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -34,16 +34,16 @@ <Boolean id='coefNonVide' javaBean='false'/> <import> - fr.ifremer.isisfish.entities.PopulationSeasonInfo; - fr.ifremer.isisfish.entities.Population; - fr.ifremer.isisfish.entities.PopulationGroup; - fr.ifremer.isisfish.entities.PopulationSeasonInfo; - fr.ifremer.isisfish.entities.Zone; - org.nuiton.math.matrix.MatrixND; - org.nuiton.math.matrix.gui.MatrixPanelEvent; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; - org.nuiton.math.matrix.gui.MatrixPanelListener; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.PopulationGroup; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Zone; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; javax.swing.text.Document </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -30,12 +30,12 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfo id='popInfo' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.PopulationSeasonInfo; - fr.ifremer.isisfish.entities.Population; - fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel; - fr.ifremer.isisfish.ui.input.renderer.PopulationSeasonInfoComboRenderer; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel; + fr.ifremer.isisfish.ui.input.renderer.PopulationSeasonInfoComboRenderer; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; java.awt.CardLayout </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,11 +28,11 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Population; - org.nuiton.math.matrix.gui.MatrixPanelEvent; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; - org.nuiton.math.matrix.gui.MatrixPanelListener; + fr.ifremer.isisfish.entities.Population; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; + org.nuiton.math.matrix.gui.MatrixPanelListener; </import> <BeanValidator id='validator' context="recruitement" Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -32,12 +32,12 @@ <Boolean id='ageGroupType' javaBean='false'/> <import> - fr.ifremer.isisfish.entities.PopulationSeasonInfo; - fr.ifremer.isisfish.ui.util.ErrorHelper; - org.nuiton.math.matrix.MatrixND; - org.nuiton.math.matrix.gui.MatrixPanelEditor; - org.nuiton.math.matrix.gui.MatrixPanelEvent; - org.nuiton.math.matrix.gui.MatrixPanelListener; + fr.ifremer.isisfish.entities.PopulationSeasonInfo; + fr.ifremer.isisfish.ui.util.ErrorHelper; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEditor; + org.nuiton.math.matrix.gui.MatrixPanelEvent; + org.nuiton.math.matrix.gui.MatrixPanelListener; javax.swing.JOptionPane </import> @@ -110,19 +110,19 @@ </cell> <cell fill='horizontal' weightx='0.5'> <JRadioButton id="radioPopulationSeasonGroupChangeLengthNoSpacialized" - buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" - selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' - enabled='{getPopulationSeasonInfo() != null}' - text="isisfish.populationSeasons.noSpacialized" onActionPerformed='spacializedActionPerformed()' - visible='{isAgeGroupType()}' decorator='boxed' /> + buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" + selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' + enabled='{getPopulationSeasonInfo() != null}' + text="isisfish.populationSeasons.noSpacialized" onActionPerformed='spacializedActionPerformed()' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> <cell fill='horizontal' weightx='0.5'> <JRadioButton id="radioPopulationSeasonGroupChangeLengthSpacialized" - buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" - selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' - enabled='{getPopulationSeasonInfo() != null}' - text="isisfish.populationSeasons.spacialized" onActionPerformed='spacializedActionPerformed()' - visible='{isAgeGroupType()}' decorator='boxed' /> + buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" + selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' + enabled='{getPopulationSeasonInfo() != null}' + text="isisfish.populationSeasons.spacialized" onActionPerformed='spacializedActionPerformed()' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> </row> <row> @@ -136,9 +136,9 @@ </cell> <cell fill='horizontal' weightx='0.5'> <JButton id="buttonPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized" - enabled='{radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected() && getPopulationSeasonInfo() != null}' - onActionPerformed='showSpacializedMatrixChangeOfGroup()' - visible='{isAgeGroupType()}' decorator='boxed'/> + enabled='{radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected() && getPopulationSeasonInfo() != null}' + onActionPerformed='showSpacializedMatrixChangeOfGroup()' + visible='{isAgeGroupType()}' decorator='boxed'/> </cell> </row> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -33,13 +33,13 @@ java.beans.PropertyChangeEvent java.beans.PropertyChangeListener fr.ifremer.isisfish.ui.input.model.PopulationSeasonInfoComboModel - fr.ifremer.isisfish.entities.PopulationSeasonInfo - fr.ifremer.isisfish.types.Month - fr.ifremer.isisfish.entities.Population - fr.ifremer.isisfish.ui.widget.Interval - org.nuiton.math.matrix.MatrixND - org.nuiton.math.matrix.gui.MatrixPanelEvent - org.nuiton.math.matrix.gui.MatrixPanelListener + fr.ifremer.isisfish.entities.PopulationSeasonInfo + fr.ifremer.isisfish.types.Month + fr.ifremer.isisfish.entities.Population + fr.ifremer.isisfish.ui.widget.Interval + org.nuiton.math.matrix.MatrixND + org.nuiton.math.matrix.gui.MatrixPanelEvent + org.nuiton.math.matrix.gui.MatrixPanelListener </import> <BeanValidator id='validator' context="seasons" Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,12 +28,12 @@ <fr.ifremer.isisfish.entities.Population id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Zone - fr.ifremer.isisfish.ui.input.model.ZoneListModel - org.nuiton.math.matrix.gui.MatrixPanelEvent - org.nuiton.math.matrix.gui.MatrixPanelListener - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + fr.ifremer.isisfish.entities.Zone + fr.ifremer.isisfish.ui.input.model.ZoneListModel + org.nuiton.math.matrix.gui.MatrixPanelEvent + org.nuiton.math.matrix.gui.MatrixPanelListener + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener java.util.List java.util.ArrayList java.awt.Dimension Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,15 +29,15 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.entities.Port - fr.ifremer.isisfish.entities.Cell - com.bbn.openmap.gui.Tool - com.bbn.openmap.gui.OMToolSet - fr.ifremer.isisfish.map.CellSelectionLayer - fr.ifremer.isisfish.map.CopyMapToClipboardListener - com.bbn.openmap.event.SelectMouseMode - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + fr.ifremer.isisfish.entities.Port + fr.ifremer.isisfish.entities.Cell + com.bbn.openmap.gui.Tool + com.bbn.openmap.gui.OMToolSet + fr.ifremer.isisfish.map.CellSelectionLayer + fr.ifremer.isisfish.map.CopyMapToClipboardListener + com.bbn.openmap.event.SelectMouseMode + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener java.awt.event.MouseEvent </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,10 +28,10 @@ <fr.ifremer.isisfish.entities.Gear id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.types.RangeOfValues - fr.ifremer.isisfish.entities.Gear - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener + fr.ifremer.isisfish.types.RangeOfValues + fr.ifremer.isisfish.entities.Gear + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener java.util.ArrayList </import> @@ -45,7 +45,7 @@ fieldGearParamPossibleValue.setText(""); } if (evt.getNewValue() != null) { - java.util.List<Object> values = new ArrayList<Object>(); + java.util.List<Object> values = new ArrayList<Object>(); for (String value : RangeOfValues.getPossibleTypes()) { values.add(value); } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -38,16 +38,16 @@ valid="{validator.isValid()}" /> <import> - fr.ifremer.isisfish.entities.Equation - fr.ifremer.isisfish.entities.Gear - fr.ifremer.isisfish.entities.Population - fr.ifremer.isisfish.entities.Selectivity - fr.ifremer.isisfish.entities.Species - fr.ifremer.isisfish.ui.input.model.GearPopulationSelectivityModel - fr.ifremer.isisfish.ui.input.model.PopulationComboModel - fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + fr.ifremer.isisfish.entities.Equation + fr.ifremer.isisfish.entities.Gear + fr.ifremer.isisfish.entities.Population + fr.ifremer.isisfish.entities.Selectivity + fr.ifremer.isisfish.entities.Species + fr.ifremer.isisfish.ui.input.model.GearPopulationSelectivityModel + fr.ifremer.isisfish.ui.input.model.PopulationComboModel + fr.ifremer.isisfish.ui.widget.editor.EquationTableEditor + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener java.util.ArrayList javax.swing.DefaultComboBoxModel </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,14 +28,14 @@ <fr.ifremer.isisfish.entities.SetOfVessels id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Port - fr.ifremer.isisfish.entities.VesselType - fr.ifremer.isisfish.entities.SetOfVessels + fr.ifremer.isisfish.entities.Port + fr.ifremer.isisfish.entities.VesselType + fr.ifremer.isisfish.entities.SetOfVessels fr.ifremer.isisfish.ui.input.model.PortComboModel fr.ifremer.isisfish.ui.input.model.VesselTypeComboModel - jaxx.runtime.swing.editor.NumberEditor - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + jaxx.runtime.swing.editor.NumberEditor + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener </import> <BeanValidator id='validator' context="basics" Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,10 +29,10 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.entities.Species; - jaxx.runtime.swing.editor.NumberEditor; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.entities.Species; + jaxx.runtime.swing.editor.NumberEditor; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; </import> <BeanValidator id='validator' Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -40,9 +40,9 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo11' javaBean='null'/> <import> - org.apache.commons.lang.StringUtils - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + org.apache.commons.lang.StringUtils + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener static org.nuiton.i18n.I18n._ </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -32,14 +32,14 @@ <fr.ifremer.isisfish.entities.StrategyMonthInfo id='strategyMonthInfo' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Strategy - fr.ifremer.isisfish.entities.StrategyMonthInfo - org.nuiton.math.matrix.gui.MatrixPanelEvent - jaxx.runtime.swing.editor.NumberEditor - fr.ifremer.isisfish.entities.TripType - org.nuiton.math.matrix.gui.MatrixPanelListener - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + fr.ifremer.isisfish.entities.Strategy + fr.ifremer.isisfish.entities.StrategyMonthInfo + org.nuiton.math.matrix.gui.MatrixPanelEvent + jaxx.runtime.swing.editor.NumberEditor + fr.ifremer.isisfish.entities.TripType + org.nuiton.math.matrix.gui.MatrixPanelListener + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener fr.ifremer.isisfish.ui.input.model.TripTypeComboModel </import> @@ -53,7 +53,7 @@ } if (evt.getNewValue() != null) { - init = true; + init = true; refresh(); init = false; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,8 +28,8 @@ <fr.ifremer.isisfish.entities.Strategy id='bean' javaBean='null'/> <import> - fr.ifremer.isisfish.entities.Strategy - fr.ifremer.isisfish.entities.SetOfVessels + fr.ifremer.isisfish.entities.Strategy + fr.ifremer.isisfish.entities.SetOfVessels java.beans.PropertyChangeEvent java.beans.PropertyChangeListener fr.ifremer.isisfish.ui.input.model.SetOfVesselsComboModel Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,10 +29,10 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.entities.TripType - fr.ifremer.isisfish.types.TimeUnit - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + fr.ifremer.isisfish.entities.TripType + fr.ifremer.isisfish.types.TimeUnit + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener </import> <BeanValidator id='validator' Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,13 +29,13 @@ <import> static org.nuiton.i18n.I18n.n_ - fr.ifremer.isisfish.entities.VesselType - fr.ifremer.isisfish.entities.TripType - fr.ifremer.isisfish.types.TimeUnit - fr.ifremer.isisfish.ui.input.model.TripTypeListModel - jaxx.runtime.swing.editor.NumberEditor - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + fr.ifremer.isisfish.entities.VesselType + fr.ifremer.isisfish.entities.TripType + fr.ifremer.isisfish.types.TimeUnit + fr.ifremer.isisfish.ui.input.model.TripTypeListModel + jaxx.runtime.swing.editor.NumberEditor + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener </import> <BeanValidator id='validator' Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,15 +24,15 @@ --> <JPanel id="wizardGroup" layout='{new BorderLayout()}'> <import> - org.nuiton.topia.TopiaContext - fr.ifremer.isisfish.IsisFishDAOHelper - fr.ifremer.isisfish.entities.Equation - fr.ifremer.isisfish.entities.Population - fr.ifremer.isisfish.entities.PopulationGroup - fr.ifremer.isisfish.entities.PopulationGroupDAO + org.nuiton.topia.TopiaContext + fr.ifremer.isisfish.IsisFishDAOHelper + fr.ifremer.isisfish.entities.Equation + fr.ifremer.isisfish.entities.Population + fr.ifremer.isisfish.entities.PopulationGroup + fr.ifremer.isisfish.entities.PopulationGroupDAO java.awt.CardLayout javax.swing.JFrame - </import> + </import> <script><![CDATA[ @@ -454,7 +454,7 @@ </cell> </row> </Table> - <Table constraints='"endInputGroupLength"'> + <Table constraints='"endInputGroupLength"'> <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JLabel text="isisfish.wizardGroupCreation.populationCharacteristics" horizontalAlignment="CENTER"/> @@ -466,7 +466,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="firstInputLength" onFocusLost='firstInputLengthChanged()'/> - </cell> + </cell> </row> <row> <cell> @@ -474,7 +474,7 @@ </cell> <cell fill='horizontal' weightx='1.0'> <JTextField id="maximalGroupsLength" onFocusLost='maximalGroupsLengthChanged()'/> - </cell> + </cell> </row> <row> <cell columns='2' fill='horizontal' weightx='1.0'> @@ -528,7 +528,7 @@ </cell> </row> </Table> - <Table constraints='"endGrowthCurveGroupLength"'> + <Table constraints='"endGrowthCurveGroupLength"'> <row> <cell columns='2' fill='horizontal' weightx='1.0'> <JLabel text="isisfish.wizardGroupCreation.populationCharacteristics" horizontalAlignment="CENTER"/> @@ -563,7 +563,7 @@ <JLabel text="isisfish.wizardGroupCreation.undefinedGrowthEquation"/> </cell> </row> - </Table> + </Table> </JPanel> <Table id="navButton" constraints='BorderLayout.SOUTH'> <row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,17 +29,17 @@ <import> static org.nuiton.i18n.I18n.n_ - javax.swing.event.ListSelectionEvent - fr.ifremer.isisfish.entities.Cell - fr.ifremer.isisfish.entities.Zone - fr.ifremer.isisfish.map.CellSelectionLayer - fr.ifremer.isisfish.map.CopyMapToClipboardListener + javax.swing.event.ListSelectionEvent + fr.ifremer.isisfish.entities.Cell + fr.ifremer.isisfish.entities.Zone + fr.ifremer.isisfish.map.CellSelectionLayer + fr.ifremer.isisfish.map.CopyMapToClipboardListener fr.ifremer.isisfish.ui.input.model.TopiaEntityListModel - com.bbn.openmap.event.SelectMouseMode - com.bbn.openmap.gui.Tool - com.bbn.openmap.gui.OMToolSet - java.beans.PropertyChangeEvent - java.beans.PropertyChangeListener + com.bbn.openmap.event.SelectMouseMode + com.bbn.openmap.gui.Tool + com.bbn.openmap.gui.OMToolSet + java.beans.PropertyChangeEvent + java.beans.PropertyChangeListener java.awt.event.MouseEvent java.util.ArrayList </import> @@ -198,7 +198,7 @@ decorator='boxed' constraints='BorderLayout.NORTH'/> <fr.ifremer.isisfish.map.IsisMapBean id='zoneMap' javaBean='new fr.ifremer.isisfish.map.IsisMapBean()' - selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" + selectionMode="{fr.ifremer.isisfish.map.CellSelectionLayer.MULT_SELECTION}" fisheryRegion='{getFisheryRegion()}' selectedCells='{getBean()==null?null:bean.getCell()}' decorator='boxed' constraints='BorderLayout.CENTER'/>  Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,10 +24,10 @@ --> <Table> <import> - fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; - fr.ifremer.isisfish.simulator.launcher.SimulationService; - javax.swing.JProgressBar; - javax.swing.ListSelectionModel; + fr.ifremer.isisfish.simulator.launcher.SimulationServiceTableModel; + fr.ifremer.isisfish.simulator.launcher.SimulationService; + javax.swing.JProgressBar; + javax.swing.ListSelectionModel; </import> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -60,8 +60,8 @@ } protected void performImport() { - File archiveFile = new File(archivePath.getText()); - getContextValue(ScriptAction.class).performImportScript(archiveFile, newFilesTableModel, conflictFilesTableModel); + File archiveFile = new File(archivePath.getText()); + getContextValue(ScriptAction.class).performImportScript(archiveFile, newFilesTableModel, conflictFilesTableModel); } protected void cancel() { @@ -119,7 +119,7 @@ <JButton id='okButton' text='isisfish.script.import.import' enabled='{isOkEnabled()}'/> <JButton id='cancelButton' text='isisfish.script.import.cancel' - onActionPerformed="cancel()" /> + onActionPerformed="cancel()" /> </JPanel> </cell> </row> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -52,7 +52,7 @@ <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' icon="script.png" /> <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' icon="script.png" /> <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.EquationModel)' icon="script.png" /> - </JMenu> + </JMenu> <JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="getScriptAction().saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' /> <JSeparator/> <JMenuItem id="miImport" text="isisfish.script.menu.txtImport" enabled="false" onActionPerformed="getScriptAction().importScript()" icon="page_white_compressed.png" /> @@ -82,7 +82,7 @@ </JMenu> </JMenuBar> -  +  <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.CENTER'> <JPanel id="buttonBar" layout='{new GridLayout()}' constraints='BorderLayout.NORTH'> <JComboBox id="scriptTypeChoice" model='{new ScriptTypesComboModel()}'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanelUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -32,15 +32,15 @@ java.util.List java.util.regex.Matcher java.util.regex.Pattern - javax.swing.table.AbstractTableModel - javax.swing.table.DefaultTableModel + javax.swing.table.AbstractTableModel + javax.swing.table.DefaultTableModel javax.swing.table.TableCellEditor javax.swing.table.TableModel javax.swing.JComboBox javax.swing.DefaultCellEditor javax.swing.event.CellEditorListener - fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain - org.apache.commons.lang.StringUtils + fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain + org.apache.commons.lang.StringUtils </import> <String id='text' javaBean='null'/> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizardUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -25,18 +25,18 @@ <JDialog title='isisfish.sensitivity.title' modal='{true}' layout='{new BorderLayout()}'> <import> - org.apache.commons.lang.StringUtils; - org.nuiton.topia.persistence.TopiaEntityContextable; + org.apache.commons.lang.StringUtils; + org.nuiton.topia.persistence.TopiaEntityContextable; fr.ifremer.isisfish.ui.SimulationUI; - fr.ifremer.isisfish.ui.simulator.SimulAction; - fr.ifremer.isisfish.ui.input.InputSaveVerifier; - fr.ifremer.isisfish.simulator.sensitivity.Factor; - fr.ifremer.isisfish.simulator.sensitivity.Domain; - fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; - fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; - fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; - java.beans.PropertyChangeEvent; - java.beans.PropertyChangeListener; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + fr.ifremer.isisfish.simulator.sensitivity.Domain; + fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; + fr.ifremer.isisfish.simulator.sensitivity.domain.EquationContinuousDomain; + fr.ifremer.isisfish.simulator.sensitivity.domain.DiscreteDomain; + java.beans.PropertyChangeEvent; + java.beans.PropertyChangeListener; java.util.SortedMap javax.swing.JComponent </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -26,27 +26,27 @@ <import> java.awt.CardLayout javax.swing.ComboBoxModel - javax.swing.table.DefaultTableModel + javax.swing.table.DefaultTableModel fr.ifremer.isisfish.datastore.RegionStorage fr.ifremer.isisfish.export.SensitivityExport - fr.ifremer.isisfish.simulator.sensitivity.Domain - fr.ifremer.isisfish.simulator.sensitivity.Factor - fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator - fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain + fr.ifremer.isisfish.simulator.sensitivity.Domain + fr.ifremer.isisfish.simulator.sensitivity.Factor + fr.ifremer.isisfish.simulator.sensitivity.SensitivityCalculator + fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain fr.ifremer.isisfish.ui.models.common.StringListModel - fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel - fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer - fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer - fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor - fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer - fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel - fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel - fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer - fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel - fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer - fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor - fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer - fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListModel + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportListRenderer + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportNameListRenderer + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellEditor + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableCellRenderer + fr.ifremer.isisfish.ui.models.sensitivityexport.SensitivityExportParametersTableModel + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboModel + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorComboRenderer + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListModel + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorListRenderer + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellEditor + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableCellRenderer + fr.ifremer.isisfish.ui.models.sensitivity.SensitivityCalculatorParametersTableModel fr.ifremer.isisfish.ui.simulator.SimulAction </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,16 +24,16 @@ --> <Table> <import> - java.util.ArrayList - java.io.File + java.util.ArrayList + java.io.File java.io.IOException javax.swing.ComboBoxModel - org.nuiton.util.FileUtil + org.nuiton.util.FileUtil fr.ifremer.isisfish.datastore.SimulationStorage fr.ifremer.isisfish.simulator.launcher.SimulationService fr.ifremer.isisfish.simulator.launcher.SimulationJob fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener - fr.ifremer.isisfish.ui.simulator.SimulAction + fr.ifremer.isisfish.ui.simulator.SimulAction fr.ifremer.isisfish.ui.models.common.StringComboModel </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,21 +24,21 @@ --> <fr.ifremer.isisfish.ui.NavigationUI> <import> - javax.swing.JPopupMenu; - javax.swing.tree.DefaultTreeModel; - javax.swing.tree.TreePath; - javax.swing.tree.DefaultMutableTreeNode; - javax.swing.tree.TreeNode; + javax.swing.JPopupMenu; + javax.swing.tree.DefaultTreeModel; + javax.swing.tree.TreePath; + javax.swing.tree.DefaultMutableTreeNode; + javax.swing.tree.TreeNode; - fr.ifremer.isisfish.datastore.RegionStorage; - fr.ifremer.isisfish.simulator.sensitivity.Factor; - fr.ifremer.isisfish.ui.WelcomePanelUI; - fr.ifremer.isisfish.ui.input.InputAction; - fr.ifremer.isisfish.ui.input.InputSaveVerifier; - fr.ifremer.isisfish.ui.simulator.SimulAction; - fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; - fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel; - fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer; + fr.ifremer.isisfish.datastore.RegionStorage; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.input.InputAction; + fr.ifremer.isisfish.ui.input.InputSaveVerifier; + fr.ifremer.isisfish.ui.simulator.SimulAction; + fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; + fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeModel; + fr.ifremer.isisfish.ui.sensitivity.model.FactorTreeCellRenderer; fr.ifremer.isisfish.ui.sensitivity.model.FactorTree javax.swing.JComponent java.awt.event.ActionListener Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -25,9 +25,9 @@ <fr.ifremer.isisfish.ui.SimulationUI> <import> - fr.ifremer.isisfish.ui.input.InputAction + fr.ifremer.isisfish.ui.input.InputAction fr.ifremer.isisfish.ui.sensitivity.SensitivitySaveVerifier - jaxx.runtime.context.JAXXInitialContext + jaxx.runtime.context.JAXXInitialContext jaxx.runtime.JAXXContext </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -28,8 +28,8 @@ <Boolean id='changed' javaBean='false'/> <import> - javax.swing.table.DefaultTableModel; - java.util.Map.Entry; + javax.swing.table.DefaultTableModel; + java.util.Map.Entry; javax.swing.event.ListSelectionListener java.util.Set java.util.Iterator Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,8 +24,8 @@ --> <Table> <import> - fr.ifremer.isisfish.ui.WelcomePanelUI; - fr.ifremer.isisfish.ui.models.common.StringListModel; + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.models.common.StringListModel; javax.swing.event.ListSelectionEvent; java.util.LinkedList </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -29,38 +29,38 @@ <Boolean id='sensitivity' javaBean='false' /> <import> - java.util.EventObject; - java.text.ParseException; - fr.ifremer.isisfish.datastore.RegionStorage; - fr.ifremer.isisfish.datastore.StorageChangeEvent; - fr.ifremer.isisfish.datastore.StorageChangeListener; - fr.ifremer.isisfish.datastore.StorageException; - fr.ifremer.isisfish.entities.Population; - fr.ifremer.isisfish.entities.Strategy; - fr.ifremer.isisfish.entities.FisheryRegion; - fr.ifremer.isisfish.ui.SimulationUI; - fr.ifremer.isisfish.ui.WelcomePanelUI; - fr.ifremer.isisfish.ui.WelcomeTabUI; - fr.ifremer.isisfish.ui.models.common.StringComboModel; - fr.ifremer.isisfish.ui.models.rule.RuleComboModel; - fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer; - fr.ifremer.isisfish.ui.models.rule.RuleListModel; - fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; - fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; - fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; - fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; - fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; - fr.ifremer.isisfish.rule.Rule; - fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; - fr.ifremer.isisfish.simulator.launcher.SimulationService; - fr.ifremer.isisfish.simulator.launcher.SimulationJob; - fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; - fr.ifremer.isisfish.simulator.sensitivity.Factor; - org.nuiton.topia.TopiaException; - org.nuiton.topia.TopiaContext; - org.nuiton.math.matrix.MatrixND; - org.nuiton.math.matrix.gui.MatrixPanelEditor; - org.apache.commons.lang.ArrayUtils; + java.util.EventObject; + java.text.ParseException; + fr.ifremer.isisfish.datastore.RegionStorage; + fr.ifremer.isisfish.datastore.StorageChangeEvent; + fr.ifremer.isisfish.datastore.StorageChangeListener; + fr.ifremer.isisfish.datastore.StorageException; + fr.ifremer.isisfish.entities.Population; + fr.ifremer.isisfish.entities.Strategy; + fr.ifremer.isisfish.entities.FisheryRegion; + fr.ifremer.isisfish.ui.SimulationUI; + fr.ifremer.isisfish.ui.WelcomePanelUI; + fr.ifremer.isisfish.ui.WelcomeTabUI; + fr.ifremer.isisfish.ui.models.common.StringComboModel; + fr.ifremer.isisfish.ui.models.rule.RuleComboModel; + fr.ifremer.isisfish.ui.models.rule.RuleNamesListRenderer; + fr.ifremer.isisfish.ui.models.rule.RuleListModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableModel; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.rule.RuleParametersTableCellRenderer; + fr.ifremer.isisfish.ui.sensitivity.FactorWizardUI; + fr.ifremer.isisfish.ui.sensitivity.SensitivityUI; + fr.ifremer.isisfish.rule.Rule; + fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher; + fr.ifremer.isisfish.simulator.launcher.SimulationService; + fr.ifremer.isisfish.simulator.launcher.SimulationJob; + fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener; + fr.ifremer.isisfish.simulator.sensitivity.Factor; + org.nuiton.topia.TopiaException; + org.nuiton.topia.TopiaContext; + org.nuiton.math.matrix.MatrixND; + org.nuiton.math.matrix.gui.MatrixPanelEditor; + org.apache.commons.lang.ArrayUtils; javax.swing.SwingUtilities javax.swing.DefaultComboBoxModel java.awt.CardLayout Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,9 +24,9 @@ --> <JPanel layout='{new BorderLayout()}'> <import> - fr.ifremer.isisfish.ui.WelcomePanelUI - fr.ifremer.isisfish.ui.models.common.StringListModel - javax.swing.event.ListSelectionEvent + fr.ifremer.isisfish.ui.WelcomePanelUI + fr.ifremer.isisfish.ui.models.common.StringListModel + javax.swing.event.ListSelectionEvent </import> <script><![CDATA[ Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -25,18 +25,18 @@ <Table> <import> java.awt.Dimension - javax.swing.table.DefaultTableModel; - fr.ifremer.isisfish.datastore.AnalysePlanStorage; - fr.ifremer.isisfish.datastore.StorageChangeEvent; - fr.ifremer.isisfish.datastore.StorageChangeListener; - fr.ifremer.isisfish.simulator.AnalysePlan; - fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboModel; - fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboRenderer; - fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListModel; - fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListRenderer; - fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableModel; - fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellEditor; - fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellRenderer; + javax.swing.table.DefaultTableModel; + fr.ifremer.isisfish.datastore.AnalysePlanStorage; + fr.ifremer.isisfish.datastore.StorageChangeEvent; + fr.ifremer.isisfish.datastore.StorageChangeListener; + fr.ifremer.isisfish.simulator.AnalysePlan; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboModel; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanComboRenderer; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListModel; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanListRenderer; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableModel; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellEditor; + fr.ifremer.isisfish.ui.models.analyzeplan.AnalyzePlanParametersTableCellRenderer; fr.ifremer.isisfish.datastore.RegionStorage; </import> <SimulAction id='simulAction' javaBean='getContextValue(SimulAction.class)' /> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -23,5 +23,5 @@ #L% --> <fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI modal="true"> - <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/> + <fr.ifremer.isisfish.ui.simulator.filter.SimulationFilterPanelUI id='content' constructorParams='this'/> </fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,14 +24,14 @@ --> <JDialog> <import> - javax.swing.text.html.HTMLEditorKit; - javax.swing.text.html.HTMLDocument; - javax.swing.event.HyperlinkListener; - javax.swing.text.html.HTMLFrameHyperlinkEvent; - javax.swing.event.HyperlinkEvent; - java.io.PrintWriter; - java.io.StringWriter; - java.net.URL; + javax.swing.text.html.HTMLEditorKit; + javax.swing.text.html.HTMLDocument; + javax.swing.event.HyperlinkListener; + javax.swing.text.html.HTMLFrameHyperlinkEvent; + javax.swing.event.HyperlinkEvent; + java.io.PrintWriter; + java.io.StringWriter; + java.net.URL; javax.swing.JComponent java.awt.Color java.awt.Desktop @@ -152,8 +152,8 @@ <row fill='horizontal'> <cell columns='2' weighty="1" fill='both'> <JScrollPane height="60"> - <JEditorPane id="helpEditor" editable="false" /> - </JScrollPane> + <JEditorPane id="helpEditor" editable="false" /> + </JScrollPane> </cell> </row> <row fill='horizontal'> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -24,15 +24,15 @@ --> <JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> <import> - com.jcraft.jsch.JSch; - com.jcraft.jsch.KeyPair; - org.nuiton.util.FileUtil; - java.io.File; - java.io.IOException; - java.util.ArrayList; - java.util.Arrays; - java.util.HashMap; - java.util.Map; + com.jcraft.jsch.JSch; + com.jcraft.jsch.KeyPair; + org.nuiton.util.FileUtil; + java.io.File; + java.io.IOException; + java.util.ArrayList; + java.util.Arrays; + java.util.HashMap; + java.util.Map; java.awt.Color javax.swing.JComponent </import> Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-06-07 09:17:13 UTC (rev 3353) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2011-06-07 09:19:29 UTC (rev 3354) @@ -183,8 +183,8 @@ <row fill='horizontal'> <cell columns='4' weighty="1" fill='both'> <JScrollPane height="200"> - <JEditorPane id="doc" /> - </JScrollPane> + <JEditorPane id="doc" /> + </JScrollPane> </cell> </row> <row fill='horizontal'>

1 0

r3353 - in isis-fish/branches/3.3.1/src: main/java/fr/ifremer/isisfish/ui/widget/editor main/java/fr/ifremer/isisfish/util/ssh test/java/fr/ifremer/isisfish/ui/widget
by chatellier＠users.labs.libre-entreprise.org 07 Jun '11

07 Jun '11

Author: chatellier Date: 2011-06-07 09:17:13 +0000 (Tue, 07 Jun 2011) New Revision: 3353 Log: Fix tab char Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2011-06-07 08:02:39 UTC (rev 3352) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2011-06-07 09:17:13 UTC (rev 3353) @@ -226,7 +226,7 @@ log.debug("getCellEditorValue [" + type + "] [mapping:" + mapping + "=" + editor); } - + return editor; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2011-06-07 08:02:39 UTC (rev 3352) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2011-06-07 09:17:13 UTC (rev 3353) @@ -64,7 +64,7 @@ */ protected String passwd; - /** + /** * Password text field. */ protected JPasswordField passwordField = new JPasswordField(20); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java 2011-06-07 08:02:39 UTC (rev 3352) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java 2011-06-07 09:17:13 UTC (rev 3353) @@ -49,7 +49,7 @@ public FormInterval(Interval i) { IntervalPanel ip = new IntervalPanel(); this.add(ip); - // ip.setEnabled(false); + // ip.setEnabled(false); ip.setModel(i); this.addWindowListener(new QuitListener());

1 0

r3352 - in isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator: launcher sensitivity
by jcouteau＠users.labs.libre-entreprise.org 07 Jun '11

07 Jun '11

Author: jcouteau Date: 2011-06-07 08:02:39 +0000 (Tue, 07 Jun 2011) New Revision: 3352 Log: Add getDisplayedValue on factors for proper display in R Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-06 15:21:10 UTC (rev 3351) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2011-06-07 08:02:39 UTC (rev 3352) @@ -95,7 +95,7 @@ /** * Cette classe est responsable de conservation de toutes les simulations faites * ou a faire. Pour ajouter une nouvelle simulation on appelle une des méthodes - * {@link #submit}. + * {@code submit}. * <p> * Cette classe sert aussi de modele pour le moniteur de queue * <p> @@ -534,6 +534,8 @@ log.error("An error occurred while trying to get nominal value", ex); } } + } else { + factor.setNominalValue("NaN"); } } } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-06-06 15:21:10 UTC (rev 3351) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityCalculator.java 2011-06-07 08:02:39 UTC (rev 3352) @@ -104,7 +104,7 @@ if (factor.getDomain() instanceof ContinuousDomain) { //Continu values, binf values, bsup values and discrete factors attributes - nominalValues += factor.getNominalValue(); + nominalValues += "\"" + factor.getNominalValue() + "\""; //Continu values continuValues += "TRUE"; Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-06-06 15:21:10 UTC (rev 3351) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2011-06-07 08:02:39 UTC (rev 3352) @@ -25,6 +25,7 @@ package fr.ifremer.isisfish.simulator.sensitivity; +import fr.ifremer.isisfish.simulator.sensitivity.domain.MatrixContinuousDomain; import java.io.Serializable; import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; @@ -58,6 +59,11 @@ protected String comment; /** + * The identifier used to compute value. + */ + protected Object identifier; + + /** * Domaine du facteur. * * Ensemble des valeurs possibles a prendre en compte. La clé est un label @@ -167,6 +173,19 @@ } /** + * Get the factor value for displaying (for example in R). + * + * @return the value + */ + public Object getDisplayedValue() { + if (domain instanceof MatrixContinuousDomain) { + return identifier; + } else { + return getValue(); + } + } + + /** * Set value. * * Unused (or only for test ?). @@ -183,6 +202,7 @@ * @param valueIdentifier new value identifier to get */ public void setValueForIdentifier(Object valueIdentifier) { + identifier = valueIdentifier; value = domain.getValueForIdentifier(valueIdentifier); }

1 0

r3351 - isis-fish/branches/3.3.1
by chatellier＠users.labs.libre-entreprise.org 06 Jun '11

06 Jun '11

Author: chatellier Date: 2011-06-06 15:21:10 +0000 (Mon, 06 Jun 2011) New Revision: 3351 Log: rSyntaxTextArea is back Modified: isis-fish/branches/3.3.1/pom.xml Modified: isis-fish/branches/3.3.1/pom.xml =================================================================== --- isis-fish/branches/3.3.1/pom.xml 2011-06-06 15:12:08 UTC (rev 3350) +++ isis-fish/branches/3.3.1/pom.xml 2011-06-06 15:21:10 UTC (rev 3351) @@ -89,6 +89,13 @@ </dependency> <dependency> + <groupId>com.fifesoft</groupId> + <artifactId>rsyntaxtextarea</artifactId> + <version>1.5.0</version> + <scope>runtime</scope> + </dependency> + + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> <version>1.4.1</version>

1 0