Author: echatellier Date: 2012-10-30 15:45:20 +0100 (Tue, 30 Oct 2012) New Revision: 3800 Url: http://forge.codelutin.com/repositories/revision/isis-fish/3800 Log: Merge trunk into current branch Added: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/BitUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Nocache.java branches/4.0.1/src/site/rst/documentation/isisscript.tex branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/BitUtilTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java Removed: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/Cache.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/Trace.java Modified: branches/4.0.1/ branches/4.0.1/LICENSE.txt branches/4.0.1/pom.xml branches/4.0.1/src/main/assembly/bin.xml branches/4.0.1/src/main/assembly/isisfish-log4j.properties branches/4.0.1/src/main/assembly/isisfish.bat branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisTray.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/CronService.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeEvent.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/Formule.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/Language.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationCapturabilityEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/VariableEquation.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/Export.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/SensitivityExport.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Coordinate.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMap.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMapList.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Motif.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Scale.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionEntityVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExport.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/AbstractXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorGroupXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanIndependent.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlan.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanIndependent.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysis.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationDiscreteDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorGroupVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/Month.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeStep.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/CommonHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/NavigationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationPriceUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/EffortDescriptionListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationSeasonInfoComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PortComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SetOfVesselsComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SpeciesComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/VesselTypeComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/ZoneListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/EffortDescriptionListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierSeasonInfoComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/PopulationSeasonInfoComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeNode.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeSelectionModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellEditor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendGraphic.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/YearSumDimensionAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptFileFilter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTranferable.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTree.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/TooltipHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/MonthComponent.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ScriptParameterDialog.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/Acceptor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/DateInterval.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterParamModel.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ValueGetter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Args.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Doc.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Docable.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/StringConverter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TimeStepConverter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Trace.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSActionEvent.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VetoableActionListener.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/package.html branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties branches/4.0.1/src/main/resources/jnlp/index.html branches/4.0.1/src/main/resources/log4j.properties branches/4.0.1/src/main/resources/sensitivity.properties branches/4.0.1/src/main/resources/templates/script/equation.ftl branches/4.0.1/src/main/resources/templates/script/export.ftl branches/4.0.1/src/main/resources/templates/script/rule.ftl branches/4.0.1/src/main/resources/templates/script/script.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl branches/4.0.1/src/main/resources/templates/script/simulator.ftl branches/4.0.1/src/main/resources/templates/ssh/qsub-script.ftl branches/4.0.1/src/main/resources/v2xsl/isis-fish-0_1.3.1.xsl branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.3.1_1.5.xsl branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.5_1.9.xsl branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.9.1_2.0.xsl branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.9_1.9.1.xsl branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.0_2.1.xsl branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.1_2.2.xsl branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.2_2.3.xsl branches/4.0.1/src/main/resources/v2xsl/isis-fish-cleaner.xsl branches/4.0.1/src/main/xmi/isis-fish.properties branches/4.0.1/src/main/xmi/isis-fish.zargo branches/4.0.1/src/site/en/rst/index.rst branches/4.0.1/src/site/resources/css/site.css branches/4.0.1/src/site/resources/downloads/Exemple_PlanAnalyse.java branches/4.0.1/src/site/resources/downloads/calibration.java branches/4.0.1/src/site/rst/contact.rst branches/4.0.1/src/site/rst/documentation.rst branches/4.0.1/src/site/rst/documentation/API.rst branches/4.0.1/src/site/rst/documentation/FAQ.rst branches/4.0.1/src/site/rst/documentation/caparmor.rst branches/4.0.1/src/site/rst/documentation/changeVersion.rst branches/4.0.1/src/site/rst/documentation/devel.rst branches/4.0.1/src/site/rst/documentation/devel/architecture.rst branches/4.0.1/src/site/rst/documentation/devel/architectureMexico.rst branches/4.0.1/src/site/rst/documentation/devel/rcaparmor.rst branches/4.0.1/src/site/rst/documentation/history/changelog.rst branches/4.0.1/src/site/rst/documentation/history/history.rst branches/4.0.1/src/site/rst/documentation/installation.rst branches/4.0.1/src/site/rst/documentation/isisFishModel.rst branches/4.0.1/src/site/rst/documentation/scripts.rst branches/4.0.1/src/site/rst/documentation/scriptsR.rst branches/4.0.1/src/site/rst/documentation/tutorials.rst branches/4.0.1/src/site/rst/documentation/tutorials/analysisPlan.rst branches/4.0.1/src/site/rst/documentation/tutorials/firstLaunch.rst branches/4.0.1/src/site/rst/documentation/tutorials/parameterising.rst branches/4.0.1/src/site/rst/documentation/tutorials/useAPI.rst branches/4.0.1/src/site/rst/documentation/tutorials/utilCaparmor.rst branches/4.0.1/src/site/rst/documentation/userManual.rst branches/4.0.1/src/site/rst/documentation/userManual/GUI.rst branches/4.0.1/src/site/rst/documentation/userManual/analysisPlan.rst branches/4.0.1/src/site/rst/documentation/userManual/inputs.rst branches/4.0.1/src/site/rst/documentation/userManual/introduction.rst branches/4.0.1/src/site/rst/documentation/userManual/launcher.rst branches/4.0.1/src/site/rst/documentation/userManual/queue.rst branches/4.0.1/src/site/rst/documentation/userManual/results.rst branches/4.0.1/src/site/rst/documentation/userManual/scripts.rst branches/4.0.1/src/site/rst/documentation/userManual/sensitivity.rst branches/4.0.1/src/site/rst/documentation/warning.rst branches/4.0.1/src/site/rst/download.rst branches/4.0.1/src/site/rst/history.rst branches/4.0.1/src/site/rst/index.rst branches/4.0.1/src/site/rst/license.rst branches/4.0.1/src/site/rst/listStats.rst branches/4.0.1/src/site/rst/news.rst branches/4.0.1/src/site/rst/othertools.rst branches/4.0.1/src/site/rst/presentation.rst branches/4.0.1/src/site/rst/publication.rst branches/4.0.1/src/site/rst/research.rst branches/4.0.1/src/site/rst/tools/eclipse.rst branches/4.0.1/src/site/rst/tools/netbeans.rst branches/4.0.1/src/site/rst/v1/changelog.rst branches/4.0.1/src/site/rst/v2/changelog.rst branches/4.0.1/src/site/rst/v2/devel/index.rst branches/4.0.1/src/site/rst/v2/index.rst branches/4.0.1/src/site/rst/v2/user/ECMAScript.rst branches/4.0.1/src/site/rst/v2/user/ECMAScriptEdit.rst branches/4.0.1/src/site/rst/v2/user/FAQ.rst branches/4.0.1/src/site/rst/v2/user/Rules.rst branches/4.0.1/src/site/rst/v2/user/ScriptHilaire.rst branches/4.0.1/src/site/rst/v2/user/SimulationLauncher.rst branches/4.0.1/src/site/rst/v2/user/index.rst branches/4.0.1/src/site/rst/v3/changelog.rst branches/4.0.1/src/site/rst/v3/devel/SyntaxeOption.rst branches/4.0.1/src/site/rst/v3/devel/index.rst branches/4.0.1/src/site/rst/v3/devel/isis-architecture.rst branches/4.0.1/src/site/rst/v3/devel/usbkey.rst branches/4.0.1/src/site/rst/v3/user/AnalysePlan.rst branches/4.0.1/src/site/rst/v3/user/ExternalScriptEditor.rst branches/4.0.1/src/site/rst/v3/user/FAQ.rst branches/4.0.1/src/site/rst/v3/user/Historique.rst branches/4.0.1/src/site/rst/v3/user/Installation.rst branches/4.0.1/src/site/rst/v3/user/Introduction.rst branches/4.0.1/src/site/rst/v3/user/LaunchOption.rst branches/4.0.1/src/site/rst/v3/user/UserInterface.rst branches/4.0.1/src/site/rst/v3/user/addSshKey.rst branches/4.0.1/src/site/rst/v3/user/index.rst branches/4.0.1/src/site/rst/v3/user/inputs.rst branches/4.0.1/src/site/rst/v3/user/isisFishData.rst branches/4.0.1/src/site/rst/v3/user/result.rst branches/4.0.1/src/site/rst/v3/user/scripts.rst branches/4.0.1/src/site/rst/v3/user/simulations.rst branches/4.0.1/src/site/site_en.xml branches/4.0.1/src/site/site_fr.xml branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/AutoMigrationIsisH2Config.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisRandomMock.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/group/FactorGroupTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/IntervalPanelTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java branches/4.0.1/src/test/resources/VCSConfig-junit_CVS.properties branches/4.0.1/src/test/resources/VCSConfig-junit_SVN.properties branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties branches/4.0.1/src/test/resources/mexico/mexicohelper_designplan.xml branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV2.xml branches/4.0.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml branches/4.0.1/src/test/resources/test-database/exports/Abundances.java branches/4.0.1/src/test/resources/test-database/exports/Biomasses.java branches/4.0.1/src/test/resources/test-database/exports/CapturesNombre.java branches/4.0.1/src/test/resources/test-database/exports/CapturesPoids.java branches/4.0.1/src/test/resources/test-database/exports/CellsDefinition.java branches/4.0.1/src/test/resources/test-database/exports/EffortsMetier.java branches/4.0.1/src/test/resources/test-database/exports/MetierZone.java branches/4.0.1/src/test/resources/test-database/exports/NonActivite.java branches/4.0.1/src/test/resources/test-database/exports/OwnerMargin.java branches/4.0.1/src/test/resources/test-database/exports/RegionDefinition.java branches/4.0.1/src/test/resources/test-database/exports/RejetsNombre.java branches/4.0.1/src/test/resources/test-database/exports/RejetsPoids.java branches/4.0.1/src/test/resources/test-database/exports/VesselMargin.java branches/4.0.1/src/test/resources/test-database/exports/ZonesDefinition.java branches/4.0.1/src/test/resources/test-database/rules/Cantonnement.java branches/4.0.1/src/test/resources/test-database/rules/CantonnementPreSimu.java branches/4.0.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java branches/4.0.1/src/test/resources/test-database/rules/EffortReduction.java branches/4.0.1/src/test/resources/test-database/rules/GraviteVPUE1.java branches/4.0.1/src/test/resources/test-database/rules/InterdictionEngin.java branches/4.0.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java branches/4.0.1/src/test/resources/test-database/rules/TACpoids.java branches/4.0.1/src/test/resources/test-database/rules/TailleMin.java branches/4.0.1/src/test/resources/test-database/rules/TotalClosure.java branches/4.0.1/src/test/resources/test-database/scripts/GravityModel.java branches/4.0.1/src/test/resources/test-database/scripts/ResultName.java branches/4.0.1/src/test/resources/test-database/scripts/RuleUtil.java branches/4.0.1/src/test/resources/test-database/scripts/SiMatrix.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorJavaExpandGrid.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRDOptimal.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRExpandGrid.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRFast.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRFrF2.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRMorris.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorROptimumLHS.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRRandomLHS.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRSobol.java branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRegularFractions.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightReferenceY7.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightRelativeY4.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightY1.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassY2.java branches/4.0.1/src/test/resources/test-database/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java branches/4.0.1/src/test/resources/test-database/simulationplans/SimulationNumberRestriction.java branches/4.0.1/src/test/resources/test-database/simulators/DefaultSimulator.java Property changes on: branches/4.0.1 ___________________________________________________________________ Modified: svn:mergeinfo - /branches/4.0.0-svnkit:3665-3698 /branches/4.1:3601-3670 /trunk:3616-3698 + /branches/4.0.0-svnkit:3665-3698 /branches/4.1:3601-3670 /trunk:3616-3799 Modified: branches/4.0.1/LICENSE.txt =================================================================== --- branches/4.0.1/LICENSE.txt 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/LICENSE.txt 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,301 +1,642 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + TERMS AND CONDITIONS - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". + 0. Definitions. -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. + "This License" refers to version 3 of the GNU General Public License. - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. + A "covered work" means either the unmodified Program or a work based +on the Program. - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. + 1. Source Code. -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. + The Corresponding Source for a work in source code form is that +same work. -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. + 2. Basic Permissions. - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. + 13. Use with the GNU Affero General Public License. -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. + 14. Revised Versions of this License. - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. - NO WARRANTY + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. + 15. Disclaimer of Warranty. - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - END OF TERMS AND CONDITIONS + 16. Limitation of Liability. - How to Apply These Terms to Your New Programs + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -303,37 +644,31 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<http://www.gnu.org/licenses/>. - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<http://www.gnu.org/philosophy/why-not-lgpl.html>. Modified: branches/4.0.1/pom.xml =================================================================== --- branches/4.0.1/pom.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/pom.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,12 +6,12 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.2</version> + <version>3.4.3</version> </parent> <groupId>fr.ifremer</groupId> <artifactId>isis-fish</artifactId> - <version>4.1.1.0-SNAPSHOT</version> + <version>4.2.2.0-SNAPSHOT</version> <!-- POM Relationships : Inheritance : Dependencies --> <dependencies> @@ -62,21 +62,15 @@ <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix</artifactId> - <version>2.2.3</version> + <version>2.3.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.nuiton.matrix</groupId> <artifactId>nuiton-matrix-gui</artifactId> - <version>2.2.3</version> + <version>2.3.2</version> <scope>compile</scope> - <exclusions> - <exclusion> - <artifactId>xml-apis</artifactId> - <groupId>xml-apis</groupId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -391,13 +385,6 @@ <scope>compile</scope> </dependency> - <!--<dependency> - <groupId>net.sourceforge.cpdetector</groupId> - <artifactId>cpdetector</artifactId> - <version>1.0.7</version> - <scope>compile</scope> - </dependency> --> - <dependency> <groupId>com.sun</groupId> <artifactId>tools</artifactId> @@ -533,12 +520,13 @@ <platform>forge.codelutin.com</platform> <siteLocales>fr,en</siteLocales> <maven.jar.main.class>fr.ifremer.isisfish.IsisFish</maven.jar.main.class> - <license.licenseName>gpl_v2</license.licenseName> + <license.licenseName>gpl_v3</license.licenseName> + <license.organizationName>Ifremer, Codelutin</license.organizationName> <!-- Dependencies version --> <jaxxVersion>2.4.2</jaxxVersion> <eugeneVersion>2.4.2</eugeneVersion> - <topiaVersion>2.6.10</topiaVersion> + <topiaVersion>2.6.13</topiaVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> @@ -637,6 +625,18 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java16-sun</artifactId> + <version>1.10</version> + </signature> + </configuration> + </plugin> </plugins> </pluginManagement> Modified: branches/4.0.1/src/main/assembly/bin.xml =================================================================== --- branches/4.0.1/src/main/assembly/bin.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/assembly/bin.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -10,7 +10,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> @@ -100,4 +100,4 @@ <outputDirectory>jri64</outputDirectory> </file> </files> -</assembly> \ No newline at end of file +</assembly> Modified: branches/4.0.1/src/main/assembly/isisfish-log4j.properties =================================================================== --- branches/4.0.1/src/main/assembly/isisfish-log4j.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/assembly/isisfish-log4j.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2011 CodeLutin, Chatellier Eric +# Copyright (C) 2011 - 2012 Ifremer, CodeLutin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of the +# published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-2.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### # Global logging configuration Modified: branches/4.0.1/src/main/assembly/isisfish.bat =================================================================== --- branches/4.0.1/src/main/assembly/isisfish.bat 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/assembly/isisfish.bat 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,4 +5,4 @@ rem SET PATH=%PATH%;%R_HOME%\bin\i386 echo [Script] Isis starting... -java -Xmx1024M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 +java -Xmx900M -Djava.library.path=jri -DR.type=jni -jar ${project.build.finalName}.${project.packaging} %1 %2 %3 %4 %5 %6 %7 %8 %9 > debug.txt 2>&1 Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisConfig.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -42,8 +42,7 @@ import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.lang3.time.DurationFormatUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.DoubleBigVector; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.StringUtil; import org.nuiton.util.Version; @@ -71,9 +70,6 @@ * by : $Author: bpoussin $ */ public class IsisConfig extends ApplicationConfig { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static Log log = LogFactory.getLog(IsisConfig.class); /** * Config step after init. @@ -119,7 +115,7 @@ * migration de donnees demande automatiquement un changement de version * d'application. */ - protected final static Version version = new Version(4, 1, 1, 0); + protected final static Version version = new Version(4, 2, 2, 0); protected final static Version majorVersion = new Version(version.getNumber(0)); protected final static Version databaseVersion = new Version( @@ -159,7 +155,7 @@ return apiVersion; } - static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2011"; + static final public String COPYRIGHT_TEXT = "Version " + getVersion() + " IFREMER-MAERHA © 2000-2012"; static final public String CONFIG_FILENAME = "isis-config-" + majorVersion.toString(); /** separateur de liste */ @@ -386,6 +382,36 @@ } /** + * Retourne le nombre maximum de thread à utiliser en in process. + * + * @return number of thread to use + */ + public int getSimulatorInMaxThreads() { + int result = getOptionAsInt(Option.SIMULATOR_IN_MAXTHREADS.key); + return result; + } + + /** + * Retourne le nombre de sous processus maximum a creer. + * + * @return number of sub process to create + */ + public int getSimulatorSubMaxProcess() { + int result = getOptionAsInt(Option.SIMULATOR_SUB_MAXPROCESS.key); + return result; + } + + /** + * Retourne la quantité de ram (Xmx) a alloue au sous processus. + * + * @return memory amount to use for sub process + */ + public String getSimulatorSubMaxMemory() { + String result = getOption(Option.SIMULATOR_SUB_MAXMEMORY.key); + return result; + } + + /** * Retourne l'url du serveur de simulation accessible via SSH. * * @return simulator server @@ -601,6 +627,25 @@ } /** + * Retourne la quantité de ram (Xmx) a alloue au processus sur caparmor. + * + * @return number of thread to use + */ + public String getSimulatorSshMaxMemory() { + String result = getOption(Option.SIMULATOR_SSH_MAXMEMORY.key); + return result; + } + + /** + * Set ssh simulation process memory to use + * + * @param memory memory + */ + public void setSimulatorSshMaxMemory(String memory) { + setOption(Option.SIMULATOR_SSH_MAXMEMORY.key, memory); + } + + /** * Retourne la clé privée de l'utilisteur courant. * * @return private ssh key path @@ -880,6 +925,18 @@ return result; } + /** + * L'implementation de la class gérant les implémentations de vecteur de + * matrice pour les fichiers mappés. + * + * @return + * @since 4.2.1.1 + */ + public Class getMappedResultMatrixVectorClass() { + Class result = getOptionAsClass(Option.MAPPED_RESULT_MATRIX_VECTOR_CLASS.key); + return result; + } + ////////////////////////////////////////////////// // Toutes les options disponibles ////////////////////////////////////////////////// @@ -911,6 +968,14 @@ SIMULATOR_LAUNCHER2(SimulationService.SIMULATION_LAUNCHER + ".1", n_("isisfish.config.main.subSimulator.description"), SubProcessSimulationLauncher.class.getName()), SIMULATOR_LAUNCHER_REMOTE(SimulationService.SIMULATION_LAUNCHER + ".2", n_("isisfish.config.main.remoteCaparmor.description"), SSHSimulatorLauncher.class.getName()), + /** Nombre maximum de thread de simulation in process. */ + SIMULATOR_IN_MAXTHREADS("simulation.in.max.threads", n_("isisfish.config.main.simulation.in.max.threads.description"), "1"), + + /** Nombre max de sous processus à lancer (-1 = pas de limite). */ + SIMULATOR_SUB_MAXPROCESS("simulation.sub.max.process", n_("isisfish.config.main.simulation.sub.max.process.description"), "-1"), + /** Mémoire max (Xmx) allouée aux sous processus. */ + SIMULATOR_SUB_MAXMEMORY("simulation.sub.max.memory", n_("isisfish.config.main.simulation.sub.max.memory.description"), "1024M"), + /** Serveur accessible par ssh : address */ SIMULATOR_SSH_SERVER("simulation.ssh.server", n_("isisfish.config.main.simulation.ssh.server.description"), "caparmor-sftp"), /** Serveur accessible par ssh : login */ @@ -933,6 +998,8 @@ SIMULATOR_SSH_CONTROLCHECKINTERVAL("simulation.ssh.control.check.interval", n_("isisfish.config.main.simulation.ssh.control.check.interval.description"), "120"), /** Serveur accessible par SSH : nombre de thread au maximum a utilise simultanement */ SIMULATOR_SSH_MAXTHREADS("simulation.ssh.max.threads", n_("isisfish.config.main.simulation.ssh.max.threads.description"), "1"), + /** Serveur accessible par SSH : mémoire (Xmx) allouée pour les process java sur caparmor */ + SIMULATOR_SSH_MAXMEMORY("simulation.ssh.max.memory", n_("isisfish.config.main.simulation.ssh.max.memory.description"), "2000M"), /** Application locale (for i18n init). */ LOCALE("locale", n_("isisfish.config.main.locale.description"), "fr_FR"), @@ -975,7 +1042,8 @@ // misc options USER_NAME("user.name", n_("isisfish.config.main.userName.description"), System.getProperty("user.name")), SMTP_SERVER("smtpServer", n_("isisfish.config.main.smtpServer.description"), "smtp"), - USER_MAIL("userMail", n_("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key); + USER_MAIL("userMail", n_("isisfish.config.main.userMail.description"), USER_NAME.key + "@" + VCS_HOST_NAME.key), + MAPPED_RESULT_MATRIX_VECTOR_CLASS("mapped.result.matrix.vector.class", n_("isisfish.config.mapped.result.matrix.vector.class.description"), DoubleBigVector.class.getName()); public String key; public String description; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFish.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -53,6 +53,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; +import org.nuiton.i18n.init.ClassPathI18nInitializer; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.math.matrix.MatrixFactory; import org.nuiton.topia.TopiaException; @@ -127,6 +128,8 @@ log.info("System arch: " + System.getProperty("os.arch")); log.info("R_HOME: " + System.getenv("R_HOME") + ", R.type: " + System.getProperty("R.type")); log.info("PATH: " + System.getenv("PATH")); + log.info("java.library.path: " + System.getProperty("java.library.path")); + } // initialisation de l'application @@ -230,8 +233,13 @@ config.parse(args); // to work in java webstart - I18n.init(new DefaultI18nInitializer("isis-fish-i18n"), config.getLocale()); - + try { + I18n.init(new DefaultI18nInitializer("isis-fish-i18n"), config.getLocale()); + } catch (Exception ex) { + // dev mode + I18n.init(new ClassPathI18nInitializer(), config.getLocale()); + } + // after init shutdown hook Runtime.getRuntime().addShutdownHook(new IsisQuitHook()); } @@ -523,6 +531,12 @@ // check protocol, user, host communityVcs.checkProtocol(); + // check file status + // WARNING : this do the real svn update + List<File> filesInClonflict = communityVcs.checkFileStatus(); + if (filesInClonflict != null && !filesInClonflict.isEmpty()) { + warnFileListDialog(_("isisfish.error.warning.title"), _("isisfish.vcs.update.warningconflict"), filesInClonflict); + } } // fin de l'init on supprime le vetoable du vcs Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFishException.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisFishRuntimeException.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisTray.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisTray.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/IsisTray.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ExportAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/ImportAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/OtherAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/SimulationAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/VCSAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/actions/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/AspectClassLoader.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/Cache.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/Cache.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,286 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.aspect; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; - -import org.apache.commons.collections.map.ReferenceMap; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codehaus.aspectwerkz.annotation.Around; -import org.codehaus.aspectwerkz.annotation.Aspect; -import org.codehaus.aspectwerkz.annotation.Expression; -import org.codehaus.aspectwerkz.definition.Pointcut; -import org.codehaus.aspectwerkz.joinpoint.JoinPoint; -import org.codehaus.aspectwerkz.joinpoint.MethodRtti; -import org.codehaus.aspectwerkz.joinpoint.MethodSignature; - -import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.simulator.SimulationContext; - -/** - * Cache aspect. - * - * Created: 25 août 06 22:42:47 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -@Aspect("perJVM") -public class Cache { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(Cache.class); - - static private List<Cache> instances = new ArrayList<Cache>(); - - protected long totalCall = 0; - protected long cacheUsed = 0; - - protected Map cache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); -// protected Map cache = new AdaptaptativeCache(1000, 95); - - @Expression("execution(* scripts..*(..))") - Pointcut scriptsMethod; - - public Cache() { - instances.add(this); - } - - /** - * Return trace object from context. - * - * @return trace object from context - */ - protected fr.ifremer.isisfish.util.Trace getTrace() { - SimulationContext context = SimulationContext.get(); - - fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context - .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); - - if (result == null) { - throw new IsisFishRuntimeException("No trace object found in context"); - } - - return result; - } - -// @Before("scriptsMethod") -// public void traceBeforeExecute (JoinPoint jp) { -// System.out.println("before !!!"); -// } -// -// @AfterThrowing("scriptsMethod") -// public void traceAfterThrowingExecute (JoinPoint jp) { -// System.out.println("throwing !!!"); -// } -// -// @After("scriptsMethod") -// public void traceAfterExecute (JoinPoint jp) { -// System.out.println("After !!!"); -// } - - - @Around("scriptsMethod") - public Object call(final JoinPoint jp) throws Throwable { - totalCall++; - Object key = computeKey(jp); - Object result = cache.get(key); - if (result == null) { - - // computation increment (/ by 0) - // FIXME need to be called, but fail with empty stack - //Method method = ((MethodSignature)jp.getSignature()).getMethod(); - //getTrace().traceAfterComputation(method); - - result = realCall(jp); -// addListenerFor(key); // pas necessaire car on a la date et pour une date donnée rien ne peut changer - if (result != null) { // util pour les methodes retournant void, ne fonctionne pas si on met AND !execute(void *(..)) dans l'aspect. En fait fonction seulement si utilisé avec les traces :( - cache.put(key, result); - } - } else { - cacheUsed++; - } - if (log.isTraceEnabled()) { - log.trace(((MethodSignature)jp.getSignature()).getMethod() - + " args " + Arrays.toString(((MethodRtti)jp.getRtti()).getParameterValues()) - + " result = " + result); - } - return result; - } - - /** - * On fait l'appel reel dans une autre methode pour pouvoir le savoir - * dans les traces - * - * @param jp - * @return ? - * @throws Throwable - */ - protected Object realCall(final JoinPoint jp) throws Throwable { - Object result = jp.proceed(); - return result; - } - - /** - * Attention pour avoir une chaine en sortie on prend la reprensentation - * toString des arguments. Mais en utilisant la methode toString implanté - * dans Object. - * <p> - * Pour les objets de style Number ou String, il faut prendre le vrai - * toString, pour que 2 soit bien egal a 2. - * - * @param jp - * @return ? - */ - protected Object computeKey(JoinPoint jp) { - Method method = ((MethodSignature)jp.getSignature()).getMethod(); - Object[] args = ((MethodRtti)jp.getRtti()).getParameterValues(); - - String result = method.toString(); - for (Object o : args) { - result += ";"; - if (o instanceof Number || o instanceof String) { - result += o.toString(); - } else { - result += ObjectUtils.identityToString(o); - } - } - - return result; - -// Method method = ((MethodSignature)jp.getSignature()).getMethod(); -// Object[] args = ((MethodRtti)jp.getRtti()).getParameterValues(); -// -// Object[] keys = new Object[args.length + 1]; -// keys[0] = method; -// System.arraycopy(args, 0, keys, 1, args.length); -// -// MultiKey result = new MultiKey(keys, false); -// -// return result; - } -// protected HashMapMultiKey.Key computeKey(JoinPoint jp) { -// Method method = ((MethodSignature)jp.getSignature()).getMethod(); -// Object[] args = ((MethodRtti)jp.getRtti()).getParameterValues(); -// -// HashMapMultiKey.Key result = new HashMapMultiKey.Key(); -// result.add(method); -// for (Object arg : args) { -// result.add(arg); -// } -// -// return result; -// } - - - /** - * @return Returns the cacheUsed. - */ - static public long getCacheUsed() { - long result = 0; - for (Cache cache : instances) { - result += cache.cacheUsed; - } - return result; - } - - /** - * @return Returns the totalCall. - */ - static public long getTotalCall() { - long result = 0; - for (Cache cache : instances) { - result += cache.totalCall; - } - return result; - } - - /** - * Affiche les statistiques - * - */ - static public String printStatistiqueAndClear() { - StringBuffer result = new StringBuffer(); - for (Cache cache : instances) { - result.append("--- Cache Statistiques ---\n"); - result.append("Total call: " + cache.totalCall + "\n"); - result.append("Cache used: " + cache.cacheUsed + "\n"); - result.append("Cache usage: " + (100*cache.cacheUsed/cache.totalCall) + "%" + "\n"); - result.append("--------------------\n"); - cache.cache.clear(); - } - System.out.println(result.toString()); - instances.clear(); - return result.toString(); - } - -// /** -// * Parcours les elements de la cle et pour ceux du type Entities se -// * met listener pour pouvoir supprimer l'entre du cache lors de leur -// * modification -// * -// * @param key -// */ -// protected void addListenerFor(HashMapMultiKey.Key key) { -// } - - - class AdaptaptativeCache extends LinkedHashMap<String, Object> { - protected int maxMemory = 95; - /** - * - * @param capacity initial capacity - * @param maxMemory maximum memory used (0-100) - */ - public AdaptaptativeCache(int capacity, int maxMemory) { - super(capacity, 0.75f, true); - this.maxMemory = maxMemory; - } - - /* (non-Javadoc) - * @see java.util.LinkedHashMap#removeEldestEntry(java.util.Map.Entry) - */ - @Override - protected boolean removeEldestEntry(Entry<String, Object> eldest) { - double free = 100.0 * Runtime.getRuntime().freeMemory() / Runtime.getRuntime().maxMemory() ; - boolean result = 100 - free > maxMemory; - return result; - } - } -} - - Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java (from rev 3799, trunk/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/CacheAspect.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,94 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.aspect; + +import java.lang.reflect.Method; +import java.util.Arrays; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codehaus.aspectwerkz.annotation.Around; +import org.codehaus.aspectwerkz.annotation.Aspect; +import org.codehaus.aspectwerkz.annotation.Expression; +import org.codehaus.aspectwerkz.definition.Pointcut; +import org.codehaus.aspectwerkz.joinpoint.JoinPoint; +import org.codehaus.aspectwerkz.joinpoint.MethodRtti; +import org.codehaus.aspectwerkz.joinpoint.MethodSignature; + +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.util.Cache; + +/** + * CacheAspect aspect. + * + * Created: 25 août 06 22:42:47 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +@Aspect("perJVM") +public class CacheAspect { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(CacheAspect.class); + + @Expression("execution(* scripts..*(..))") + Pointcut scriptsMethod; + + public CacheAspect() { + } + + /** + * Return trace object from context. + * + * @return trace object from context + */ + protected Cache getCache() { + SimulationContext context = SimulationContext.get(); + Cache result = context.getCache(); + return result; + } + + @Around("scriptsMethod") + public Object call(final JoinPoint jp) throws Throwable { + Method method = ((MethodSignature)jp.getSignature()).getMethod(); + Object[] args = ((MethodRtti)jp.getRtti()).getParameterValues(); + Object result = getCache().get(method, args, jp); + + if (log.isTraceEnabled()) { + log.trace(((MethodSignature)jp.getSignature()).getMethod() + + " args " + Arrays.toString(((MethodRtti)jp.getRtti()).getParameterValues()) + + " result = " + result); + } + return result; + } + +} + + Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/RuleAspect.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Deleted: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/Trace.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/Trace.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,127 +0,0 @@ -/* - * #%L - * IsisFish - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. - * #L% - */ - -package fr.ifremer.isisfish.aspect; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codehaus.aspectwerkz.annotation.After; -import org.codehaus.aspectwerkz.annotation.AfterThrowing; -import org.codehaus.aspectwerkz.annotation.Aspect; -import org.codehaus.aspectwerkz.annotation.Before; -import org.codehaus.aspectwerkz.annotation.Expression; -import org.codehaus.aspectwerkz.definition.Pointcut; -import org.codehaus.aspectwerkz.joinpoint.JoinPoint; -import org.codehaus.aspectwerkz.joinpoint.MethodSignature; - -import fr.ifremer.isisfish.IsisFishRuntimeException; -import fr.ifremer.isisfish.simulator.SimulationContext; - -/** - * Permet de tracer les appels aux methodes utilisateur ainsi que l'execution - * a ces methodes. La difference entre les deux est lors de l'utilisation du - * cache les appels seront superieur a l'execution car certaine valeur seront - * reutilisé dans le cache - * - * Created: 25 août 06 22:19:21 - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -@Aspect("perJVM") -public class Trace { - - /** to use log facility, just put in your code: log.info("..."); */ - static private Log log = LogFactory.getLog(Trace.class); - - static private List<Trace> instances = new ArrayList<Trace>(); - - @Expression("execution(* scripts..*(..))" - + " || execution(* simulators..*(..))" - + " || execution(* rules..*(..)) " - + " || execution(* simulationplans..*(..)) " - + " || execution(* formules..*(..))") - Pointcut executeMethod; - - public Trace() { - instances.add(this); - } - - /** - * Return trace object from context. - * - * @return trace object from context - */ - protected fr.ifremer.isisfish.util.Trace getTrace() { - SimulationContext context = SimulationContext.get(); - - fr.ifremer.isisfish.util.Trace result = (fr.ifremer.isisfish.util.Trace) context - .getValue(fr.ifremer.isisfish.util.Trace.class.getName()); - - if (result == null) { - throw new IsisFishRuntimeException("No trace object found in context"); - } - - return result; - } - - @Before("executeMethod") - public void traceBeforeExecute(JoinPoint jp) { - getTrace().traceBefore(); - } - - @AfterThrowing(type = "Exception", pointcut = "executeMethod") - public void traceAfterThrowingExecute(JoinPoint jp) { - // si une exeption est leve, il faut faire la meme chose - traceAfterExecute(jp); - } - - @After("executeMethod") - public void traceAfterExecute(JoinPoint jp) { - Method method = ((MethodSignature) jp.getSignature()).getMethod(); - getTrace().traceAfterCall(method); - } - - /** - * Affiche les statistiques - * - * @return statistics as string - */ - public static String printStatistiqueAndClear() { - StringBuffer result = new StringBuffer(); - for (Trace trace : instances) { - result.append(trace.getTrace().printStatisticAndClear()); - } - instances.clear(); - return result.toString(); - } -} Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java (from rev 3799, trunk/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/TraceAspect.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,104 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.aspect; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codehaus.aspectwerkz.annotation.After; +import org.codehaus.aspectwerkz.annotation.AfterThrowing; +import org.codehaus.aspectwerkz.annotation.Aspect; +import org.codehaus.aspectwerkz.annotation.Before; +import org.codehaus.aspectwerkz.annotation.Expression; +import org.codehaus.aspectwerkz.definition.Pointcut; +import org.codehaus.aspectwerkz.joinpoint.JoinPoint; +import org.codehaus.aspectwerkz.joinpoint.MethodSignature; + +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.util.Trace; + +/** + * Permet de tracer les appels aux methodes utilisateur ainsi que l'execution + * a ces methodes. La difference entre les deux est lors de l'utilisation du + * cache les appels seront superieur a l'execution car certaine valeur seront + * reutilisé dans le cache + * + * Created: 25 août 06 22:19:21 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +@Aspect("perJVM") +public class TraceAspect { + + /** to use log facility, just put in your code: log.info("..."); */ + static private Log log = LogFactory.getLog(TraceAspect.class); + + @Expression("execution(* scripts..*(..))" + + " || execution(* simulators..*(..))" + + " || execution(* rules..*(..)) " + + " || execution(* simulationplans..*(..)) " + + " || execution(* formules..*(..))") + Pointcut executeMethod; + + public TraceAspect() { + } + + /** + * Return trace object from context. + * + * @return trace object from context + */ + protected Trace getTrace() { + SimulationContext context = SimulationContext.get(); + Trace result = context.getTrace(); + return result; + } + + @Before("executeMethod") + public void traceBeforeExecute(JoinPoint jp) { + getTrace().traceBefore(); + } + + @AfterThrowing(type = "java.lang.Exception", pointcut = "executeMethod") + public void traceAfterThrowingExecute(JoinPoint jp) { + // si une exeption est leve, il faut faire la meme chose + traceAfterExecute(jp); + } + + @After("executeMethod") + public void traceAfterExecute(JoinPoint jp) { + Method method = ((MethodSignature) jp.getSignature()).getMethod(); + getTrace().traceAfterCall(method); + } +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/aspect/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/CronService.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/CronService.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/CronService.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/RemoveOldFileTask.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/cron/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/CodeSourceStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ExportStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/FormuleStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -178,7 +178,7 @@ try { @SuppressWarnings("unchecked") - List<String> contextCategory = (List<String>) context.find( + List<String> contextCategory = (List<String>) context.findAll( "SELECT DISTINCT category FROM Equation"); all.addAll(contextCategory); } catch (TopiaException eee) { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/JavaSourceStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java (from rev 3799, trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultDatabaseStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,843 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore; + +import static org.nuiton.i18n.I18n._; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +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.topia.TopiaException; +import org.nuiton.util.ArrayUtil; +import org.nuiton.util.HashList; + +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.entities.ActiveRule; +import fr.ifremer.isisfish.entities.ActiveRuleDAO; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.Result; +import fr.ifremer.isisfish.entities.ResultDAO; +import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.SimulationException; +import fr.ifremer.isisfish.simulator.SimulationPlan; +import fr.ifremer.isisfish.simulator.SimulationResultGetter; +import fr.ifremer.isisfish.types.TimeStep; +import fr.ifremer.isisfish.types.Month; + +/** + * Cette classe permet de conserver des résultats de simulation. Elle permet + * ensuite de les récupérer. + * + * Created: 29 sept. 2004 + * + * @author Benjamin Poussin <poussin@codelutin.com> + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ResultDatabaseStorage implements SimulationResultGetter, ResultStorage { // ResultDatabaseStorage + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(ResultDatabaseStorage.class); + + protected SimulationStorage simulation = null; + // transient protected HashMap<String, MatrixND> globalMatrix = new HashMap<String, MatrixND>(); + transient protected ReferenceMap cacheContext = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); + + /** cache to maintains some result. key: String(date + ':' + name), value: matrix + * TODO: cache will be more efficient if it keep at min the number of result by year */ + transient protected ReferenceMap cache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); + /** contains all available result as string: String(date + ':' + name) */ + transient protected Set<String> availableResult = null; + /** result enabled */ + transient protected Set<String> enabledResult = null; + + /** + * Les ResultStorage ne doivent pas etre instancier directement, mais + * recuperer a partir d'un + * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultStorage()} + * + * @param simulation storage to get result + */ + public ResultDatabaseStorage(SimulationStorage simulation) { + this.simulation = simulation; + } + + @Override + public void delete() { + TopiaContext tx = null; + boolean mustClose = false; + + try { + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } + + if (tx == null) { + // not in simulation, create transaction + tx = simulation.getStorage().beginTransaction(); + mustClose = true; + } + + tx.execute("DELETE " + Result.class.getName()); + if (mustClose) { + tx.closeContext(); + } + } catch (Exception ex) { + if (log.isErrorEnabled()) { + log.error("Can't delete results", ex); + } + } + } + + @Override + public void close() { + // do nothing, closed by simulation storage closing + } + + protected void putInCache(TimeStep step, String name, MatrixND mat, TopiaContext context) { + String key = step.getStep() + ":" + name; + putInCache(key, mat, context); + } + + protected void putInCache(String name, MatrixND mat, TopiaContext context) { + if (mat != null) { + cache.put(name, mat); + cacheContext.put(name, context); + } + } + + /** + * Result can be removed from cache when computed result (from multiple step) + * become invalidated by new step result. + * + * @param name result name to remove + */ + protected void removeInCache(String name) { + cache.remove(name); + cacheContext.remove(name); + } + + protected MatrixND getInCache(TimeStep step, String name) { + // do not use toString for step (depend on i18n) + String key = step.getStep() + ":" + name; + MatrixND result = getInCache(key); + return result; + } + + protected MatrixND getInCache(String name) { + MatrixND result = null; + TopiaContext context = (TopiaContext) cacheContext.get(name); + if (context != null && !context.isClosed()) { + // on verifie que le context existe encore car on peut vouloir + // naviguer dans les semantics + result = (MatrixND) cache.get(name); + } + return result; + } + + /** + * Retourne le nom de tous les resultats disponibles le nom est constitué + * de la date et du nom du resultat. + * + * @return available results + */ + protected Set<String> getAvailableResult() { + if (availableResult == null) { + availableResult = new HashSet<String>(); + try { + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } + + if (tx == null) { + // not in simulation, create transaction + tx = simulation.getStorage().beginTransaction(); + mustClose = true; + } + + List<String> result = (List<String>) tx.findAll("Select " + Result.PROPERTY_RESULT_STEP + "||':'||name from fr.ifremer.isisfish.entities.Result"); + if (mustClose) { + tx.closeContext(); + } + availableResult.addAll(result); + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Can't get result available", eee); + } + } + } + return availableResult; + } + + /** + * Verifie si un resultat est disponible pour une date donnée. + * + * @param step + * @param name + * @return {@code true} if result is available + */ + protected boolean isAvailableResult(TimeStep step, String name) { + String key = step.getStep() + ":" + name; + boolean result = getAvailableResult().contains(key); + return result; + } + + /** + * Ajoute un resultat comme etant disponible pour une date donnée. + * + * @param step + * @param name + */ + protected void addAvailableResult(TimeStep step, String name) { + String key = step.getStep() + ":" + name; + getAvailableResult().add(key); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#isEnabled(java.lang.String) + */ + @Override + public boolean isEnabled(String name) { + name = name.trim(); + if (enabledResult == null) { + enabledResult = new HashSet<String>(); + + Collection<String> resultEnabled = simulation.getParameter() + .getResultEnabled(); + enabledResult.addAll(resultEnabled); + + // test on export + List<String> exportNames = simulation.getParameter().getExportNames(); + if (exportNames != null) { + for (String exportName : exportNames) { + ExportStorage storage = ExportStorage.getExport(exportName); + try { + Export export = storage.getNewExportInstance(); + for (String resultName : export.getNecessaryResult()) { + enabledResult.add(resultName); + } + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn(_("isisfish.error.instanciate.export", + exportName), eee); + } + } + } + } + + // test on sensitivity export + List<SensitivityExport> sensitivityExports = simulation + .getParameter().getSensitivityExport(); + if (sensitivityExports != null) { + for (SensitivityExport sensitivityExport : sensitivityExports) { + for (String resultName : sensitivityExport.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + + // test on rules + List<Rule> rules = simulation.getParameter().getRules(); + if (rules != null) { + for (Rule rule : rules) { + for (String resultName : rule.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + + // test on plans + List<SimulationPlan> plans = simulation.getParameter().getSimulationPlans(); + if (plans != null) { + for (SimulationPlan plan : plans) { + for (String resultName : plan.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + log.info("Enabled result: " + enabledResult); + } + boolean result = enabledResult.contains(name); + return result; + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(TimeStep step, MatrixND mat) throws IsisFishException { + addResult(false, step, mat.getName(), mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(TimeStep step, Population pop, MatrixND mat) throws IsisFishException { + addResult(false, step, mat.getName(), pop, mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(boolean force, TimeStep step, MatrixND mat) throws IsisFishException { + addResult(force, step, mat.getName(), mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(boolean force, TimeStep step, Population pop, MatrixND mat) throws IsisFishException { + addResult(force, step, mat.getName(), pop, mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, java.lang.String, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { + addResult(false, step, name, pop, mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(TimeStep step, String name, MatrixND mat) throws IsisFishException { + addResult(false, step, name, mat); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, java.lang.String, fr.ifremer.isisfish.entities.Population, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(boolean force, TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { + if (force || isEnabled(name)) { + doAddResult(step, name + " " + pop, mat); + } + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addResult(boolean, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(boolean force, TimeStep step, String name, MatrixND mat) throws IsisFishException { + if (force || isEnabled(name)) { + doAddResult(step, name, mat); + } + } + + protected void doAddResult(TimeStep step, String name, MatrixND mat) throws IsisFishException { + try { + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } + if (tx == null) { + // not in simulation, create transaction + tx = simulation.getStorage().beginTransaction(); + mustClose = true; + } + doAddResult(step, name, mat, tx); + if (mustClose) { + tx.commitTransaction(); + tx.closeContext(); + } + } catch (TopiaException eee) { + log.warn("Can't add result '" + name + "' at step " + step, eee); + } + } + + protected void doAddResult(TimeStep step, String name, MatrixND mat, + TopiaContext tx) throws IsisFishException { + // si la matrice n'a pas de semantique on refuse + for (int i = 0; i < mat.getDimCount(); i++) { + // la semantique n'est pas bonne des qu'il y a un null dedans + if (mat.getSemantic(i).contains(null)) { + throw new SimulationException( + "Erreur le résultat que vous souhaitez enregistrer n'a pas d'information convenable pour la dimension: " + + i + " " + mat.getDimensionName(i)); + } + } + + // on fait une copie pour avoir reellement des resultats independant + // FIXME echatellier 20120829 : faire une copie optimiser + // suivant l'implementation du vector plutot qu'un parcourt + // via un iterateur de semantiques (plus couteux) + MatrixND newMat = mat.copy(); + try { + ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); + Result result = resultPS.create(); + result.setResultStep(step); + result.setName(name); + result.setMatrix(newMat); + resultPS.update(result); + + addAvailableResult(step, name); + putInCache(step, name, newMat, tx); + + // depuis isis fish 4.1.1, le commit est automatique à chaque + // résultat (gain de performance de 20% avec le clearCache) + tx.commitTransaction(); + // vide le cache hibernate. Sans cela, les resultats ne sont + // jamais supprimé du cache car la session n'est close + // qu'à la fin de la simulation + tx.clearCache(); + + // remove from cache result computed by #getMatrix(name) + // beacause, if a new step is added, result become false + // but DO NOT REMOVE result named step + name + removeInCache(name); + + } catch (TopiaException eee) { + log.warn("Can't add result '" + name + "' at step " + step, eee); + } + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#addActiveRule(fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.rule.Rule) + */ + @Override + public void addActiveRule(TimeStep step, Rule rule) throws IsisFishException { + try { + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } + if (tx == null) { + // not in simulation, create transaction + tx = simulation.getStorage().beginTransaction(); + mustClose = true; + } + ActiveRuleDAO ps = IsisFishDAOHelper.getActiveRuleDAO(tx); + ActiveRule result = ps.create(); + result.setActiveRuleStep(step); + result.setName(RuleStorage.getName(rule)); + result.setParam(RuleStorage.getParamAsString(rule)); + ps.update(result); + if (mustClose) { + tx.commitTransaction(); + tx.closeContext(); + } + } catch (TopiaException eee) { + throw new IsisFishException("Can't add result", eee); + } + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getResultName() + */ + @Override + public List<String> getResultName() { + + List<String> result = null; + try { + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } + if (tx == null) { + // not in simulation, create transaction + tx = simulation.getStorage().beginTransaction(); + mustClose = true; + } + ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); + + result = (List<String>) resultPS.getContext() + .findAll("Select distinct name from fr.ifremer.isisfish.entities.Result order by name"); + if (mustClose) { + tx.closeContext(); + } + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't get result name", eee); + } + } + if (result == null) { + result = new ArrayList<String>(); + } + return result; + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.types.TimeStep, fr.ifremer.isisfish.entities.Population, java.lang.String) + */ + @Override + public MatrixND getMatrix(TimeStep step, Population pop, String name) { + String newName = name + " " + pop; + return getMatrix(step, newName); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.types.TimeStep, java.lang.String) + */ + @Override + public MatrixND getMatrix(TimeStep step, String name) { + MatrixND mat = getInCache(step, name); + if (mat == null && isAvailableResult(step, name)) { + try { + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } + if (tx == null) { + // not in simulation, create transaction + tx = simulation.getStorage().beginTransaction(); + mustClose = true; + } + mat = getMatrix(step, name, tx); + if (mustClose) { + // FIXME transaction never closed + // quand peut on fermer la transaction ? + // lorsque plus aucune matrice ne l'utilise. + // donc mettre la matrice et la connexion dans une map + // la matrice dans une weak reference. Des que la matrice + // est liberer faire un close sur la transaction + } else { + // echatellier 20120829 : vidage du cache hibernate + // sinon on fait trop de lecture que la meme transaction + // et le cache hibernate se remplit sans se vider + //tx.clearCache(); + } + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Can't return matrix '" + name + "' for step " + + step, eee); + } + } + } + return mat; + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.topia.TopiaContext) + */ + @Override + public MatrixND getMatrix(TimeStep step, String name, TopiaContext tx) { + MatrixND mat = getInCache(step, name); + if (mat == null && isAvailableResult(step, name)) { + try { + ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); + Result result = resultPS.findByProperties( + Result.PROPERTY_RESULT_STEP, step, + Result.PROPERTY_NAME, name); + if (result != null) { + mat = result.getMatrix(); + putInCache(step, name, mat, tx); + } + } catch (Exception eee) { + if (log.isWarnEnabled()) { + log.warn("Can't return matrix '" + name + "' for step " + + step, eee); + } + } + } + return mat; + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.entities.Population, java.lang.String) + */ + @Override + public MatrixND getMatrix(Population pop, String name) { + String newName = name + " " + pop; + return getMatrix(newName); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.entities.Population, java.lang.String, org.nuiton.topia.TopiaContext) + */ + @Override + public MatrixND getMatrix(Population pop, String name, TopiaContext tx) { + String newName = name + " " + pop; + return getMatrix(newName, tx); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(java.lang.String) + */ + @Override + public MatrixND getMatrix(String name) { + MatrixND resultMat = null; + try { + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } + if (tx == null) { + // not in simulation, create transaction + tx = simulation.getStorage().beginTransaction(); + mustClose = true; + } + resultMat = getMatrix(name, tx); + if (mustClose) { + // FIXME transaction never closed + // quand peut on fermer la transaction ? + // lorsque plus aucune matrice ne l'utilise. + // donc mettre la matrice et la connexion dans une map + // la matrice dans une weak reference. Des que la matrice + // est liberer faire un close sur la transaction + } else { + // echatellier 20120829 : vidage du cache hibernate + // sinon on fait trop de lecture que la meme transaction + // et le cache hibernate se remplit sans se vider + //tx.clearCache(); + } + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't get result: " + name, eee); + } + } + return resultMat; + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(java.lang.String, org.nuiton.topia.TopiaContext) + */ + @Override + public MatrixND getMatrix(String name, TopiaContext tx) { + log.debug("Get result: " + name); + + MatrixND resultMat = getInCache(name); + if (resultMat != null) { + return resultMat; + } + + // recuperation des resultats qui nous interesse + List<Result> results = null; + try { + ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); + results = resultPS.findAllByName(name); + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn("Can't get result: " + name, eee); + } + } + + // s'il n'y pas de resultat, on retourne null + if (results == null || results.size() == 0) { + return null; + } + + // Creation des listes pour chaque dimension + + // creation de la liste de date + TimeStep lastStep = getLastStep(); + List<TimeStep> steps = new ArrayList<TimeStep>(); + TimeStep step = new TimeStep(0); + steps.add(step); + while (step.before(lastStep)) { + step = step.next(); + steps.add(step); + } + + if (log.isTraceEnabled()) { + log.trace("Steps list : " + steps); + } + + // recuperation des dimensions des matrices + MatrixND mat = (MatrixND) results.get(0).getMatrix(); + + // recuperation des noms des dimensions + String[] dimNames = new String[1 + mat.getDimCount()]; + dimNames[0] = _("isisfish.common.date"); + for (int i = 1; i < dimNames.length; i++) { + dimNames[i] = mat.getDimensionName(i - 1); + } + + // creation de la semantique pour la matrice resultat. +1 pour les dates + List[] sem = new List[1 + mat.getDimCount()]; + sem[0] = steps; + + for (int i = 1; i < sem.length; i++) { + sem[i] = new HashList(); + } + + for (Result result : results) { + MatrixND mattmp = result.getMatrix(); + if (log.isTraceEnabled()) { + log.trace("Ajout de la semantics: " + + Arrays.asList(mattmp.getSemantics())); + } + + for (int s = 0; s < mattmp.getDimCount(); s++) { + sem[s + 1].addAll(mattmp.getSemantic(s)); + } + } + + if (log.isTraceEnabled()) { + log.trace("La semantique final est: " + Arrays.asList(sem)); + } + + // creation de la matrice resultat + resultMat = MatrixFactory.getInstance().create(name, sem, dimNames); + + // recuperation du resultat pour chaque date de la simulation, de Date(0) à lastDate + for (Result result : results) { + TimeStep d = result.getResultStep(); + mat = result.getMatrix(); + // on met ce resultat dans la matrice result si besoin + if (mat != null) { + // on recupere dans la matrice resultat l'endroit on il faut + // mettre la matrice + MatrixND submat = resultMat.getSubMatrix(0, d, 1); + // on met les valeur de mat dans la sous matrice extraite + for (MatrixIterator mi = mat.iterator(); mi.next();) { + submat.setValue( + ArrayUtil.concat(new Object[] { d }, + mi.getSemanticsCoordinates()), mi.getValue()); + } + } + } + + putInCache(name, resultMat, tx); + return resultMat; + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getLastStep() + */ + @Override + public TimeStep getLastStep() { + int monthNumber = simulation.getParameter().getNumberOfYear() + * Month.NUMBER_OF_MONTH; + TimeStep result = new TimeStep(monthNumber - 1); // -1 because date begin at 0 + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(SimulationContext context, TimeStep step, String name, + MatrixND mat) throws IsisFishException { + try { + doAddResult(step, name, mat, context.getDbResult()); + } catch (TopiaException eee) { + log.warn(_("Can't add result '%1$s' at date %2$s", name, step), eee); + } + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String) + */ + @Override + public MatrixND getMatrix(SimulationContext context, TimeStep step, String name) { + MatrixND result = null; + try { + result = getMatrix(step, name, context.getDbResult()); + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn(_("Can't get result: %1$s", name), eee); + } + } + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, java.lang.String) + */ + @Override + public MatrixND getMatrix(SimulationContext context, String name) { + MatrixND result = null; + try { + result = getMatrix(name, context.getDbResult()); + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn(_("Can't get result: %1$s", name), eee); + } + } + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) + */ + @Override + public void afterSimulation(SimulationContext context) { + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) + */ + @Override + public void beforeSimulation(SimulationContext context) { + } + + // public void addActivatedRule(ResultStorage self, Date date, RegleParam rule){ + // List rules = (List)activatedRules.get(date); + // if(rules == null){ + // activatedRules.put(date, rules = new LinkedList()); + // } + // rules.add(rule); + // } + + // /** + // * Retourne pour une date données tous les RegleParam qui ont été activé + // * a la date demandé. + // * @return une list de {@link fr.ifremer.nodb.RegleParam} + // */ + // public List getActivatedRule(ResultStorage self, Date date){ + // List rules = (List)activatedRules.get(date); + // if(rules == null){ + // activatedRules.put(date, rules = new LinkedList()); + // } + // return rules; + // } + +} // ResultDatabaseStorage Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java (from rev 3799, trunk/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultMappedStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,979 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore; + +import static org.nuiton.i18n.I18n._; + +import java.io.File; +import java.io.IOException; +import java.io.RandomAccessFile; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +import org.apache.commons.collections.BidiMap; +import org.apache.commons.collections.bidimap.DualHashBidiMap; +import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.DoubleBigMappedVector; +import org.nuiton.math.matrix.DoubleBigVector; +import org.nuiton.math.matrix.MatrixFactory; +import org.nuiton.math.matrix.MatrixHelper; +import org.nuiton.math.matrix.MatrixIterator; +import org.nuiton.math.matrix.MatrixND; +import org.nuiton.math.matrix.MatrixSemanticsDecorator; +import org.nuiton.math.matrix.SemanticsDecorator; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.util.ArrayUtil; +import org.nuiton.util.HashList; + +import fr.ifremer.isisfish.IsisFish; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.IsisFishException; +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.entities.ActiveRule; +import fr.ifremer.isisfish.entities.ActiveRuleDAO; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.export.Export; +import fr.ifremer.isisfish.export.SensitivityExport; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.simulator.SimulationException; +import fr.ifremer.isisfish.simulator.SimulationPlan; +import fr.ifremer.isisfish.simulator.SimulationResultGetter; +import fr.ifremer.isisfish.simulator.SimulationResultListener; +import fr.ifremer.isisfish.types.Month; +import fr.ifremer.isisfish.types.TimeStep; +import fr.ifremer.isisfish.util.BitUtil; + +/** + * Cette classe permet de conserver des résultats de simulation. Elle permet + * ensuite de les récupérer. + * + * Created: 31 aout 2012 + * + * @author Benjamin Poussin <poussin@codelutin.com> + * @version $Revision$ + * + * Mise a jour: $Date$ + * par : $Author$ + */ +public class ResultMappedStorage implements SimulationResultListener, + SimulationResultGetter, ResultStorage { // ResultStorage + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(ResultMappedStorage.class); + + protected MatrixFactory matrixFactory = MatrixFactory.getInstance(DoubleBigVector.class); + + protected SimulationStorage simulation = null; + protected RandomAccessFile raf; + protected long offset; + protected Map<TimeStep, Map<String, ResultMapped>> stepNameResults = + new TreeMap<TimeStep, Map<String, ResultMapped>>(); + protected Map<String, Map<TimeStep, ResultMapped>> nameStepResults = + new TreeMap<String, Map<TimeStep, ResultMapped>>(); + + /** result enabled */ + transient protected Set<String> enabledResult = null; + + /** + * Convertie une entite, month, timestep en string et inversement. + * Entity = "TopiaId:Entity.toString" + */ + static protected class EntitySemanticsDecorator implements SemanticsDecorator { + static final private String SEP = ":"; + + protected TopiaContext tx; + /** en cle les representation interne (get) en valeur les valeurs decoree (getKey) */ + protected BidiMap cache = new DualHashBidiMap(); + + public EntitySemanticsDecorator() { + } + + public EntitySemanticsDecorator(TopiaContext tx) { + this.tx = tx; + } + + public Object decorate(Object internalValue) { + Object result = cache.get(internalValue); + if (result == null && internalValue != null) { + result = internalValue; + if (internalValue instanceof String) { + // on retrouve souvent les memes semantiques dans les matrices + // pour minimiser les chaines en memoire, on prend la representation + // interne avant de l'utiliser comme cle. + internalValue = ((String)internalValue).intern(); + result = internalValue; + if (StringUtils.startsWith((String)internalValue, Month.class.getName())) { + String val = StringUtils.substringAfter((String)internalValue, SEP); + int monthNumber = Integer.parseInt(val); + result = new Month(monthNumber); + } else if (StringUtils.startsWith((String)internalValue, TimeStep.class.getName())) { + String val = StringUtils.substringAfter((String)internalValue, SEP); + int stepNumber = Integer.parseInt(val); + result = new TimeStep(stepNumber); + } else if (StringUtils.startsWith((String)internalValue, "fr.ifremer.isisfish.entities.")) { + if (tx == null) { + result = StringUtils.substringAfter((String)internalValue, SEP); + } else { + try { + String id = StringUtils.substringBefore((String)internalValue, SEP); + result = tx.findByTopiaId(id); + } catch (TopiaException eee) { + log.info("Fallback use string representation because" + + " i can't decorate (String->Entity): " + + internalValue, eee); + // si on arrive pas a convertir cette fois-ci, on + // renvoi internalValue pour que le undecorate est toutes les infos + // et donc que la prochaine fois on y arrive peut etre + } + } + } + } + cache.put(internalValue, result); + } + return result; + } + + public Object undecorate(Object decoratedValue) { + Object result = cache.getKey(decoratedValue); + if (result == null && decoratedValue != null) { + if (decoratedValue instanceof Month) { + result = Month.class.getName() + SEP + ((Month)decoratedValue).getMonthNumber(); + } else if (decoratedValue instanceof TimeStep) { + result = TimeStep.class.getName() + SEP + ((TimeStep)decoratedValue).getStep(); + } else if (decoratedValue instanceof TopiaEntity) { + result = ((TopiaEntity)decoratedValue).getTopiaId() + SEP + decoratedValue; + } else { + result = String.valueOf(decoratedValue); + } + // on retrouve souvent les memes semantiques dans les matrices + // pour minimiser les chaines en memoire, on prend la representation + // interne avant de l'utiliser comme cle. + cache.put(((String)result).intern(), decoratedValue); + } + return result; + } + + } + + /** + * Represente un resultat + * Lors de la construction, si on ne passe que le RandomAccessFile et l'offset, on relie un resultat + * si on passe toutes les infos, on ecrit le resultat. + * Les deux operations doivent etre symetrique on lit et ecrit les meme informations + */ + static protected class ResultMapped { + protected RandomAccessFile raf; + protected long offset; + protected long size; + protected TimeStep step; + protected String name; + protected MatrixND matrix; + + /** + * Classe permettant de lire et ecrire le header d'un resultat matrice + * Le header comprend tout sauf les donnees de la matrice. + * Si on ne retrouve pas la mark, alors on ne lit pas le resultat. + * Cette classe sert a simplifier la lecture et l'ecriture pour garantir + * la symetrie entre les deux + */ + static protected class ResultHeaderMatrix { + final static long RESULT_MATRIX = BitUtil.toMark("resmat01"); + + int stepValue; // le pas de temps + String name; // le nom du resultat + int dimSize; // le nombre de dimension + String[] dimNames; // le nom des dimensions + int[] dims; // la taille de chaque dimension + List[] sems; // les semantiques de chaque dimension + int dataSize; // la taille du vecteur. En mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice + + /** + * Methode qui prend tous les champs en parametre, ce qui force a ne pas en oublier + * @param stepValue + * @param name + * @param dimSize + * @param dimNames + * @param dims + * @param sems + * @param dataSize + */ + public void set(int stepValue, String name, int dimSize, + String[] dimNames, int[] dims, List[] sems, int dataSize) { + this.stepValue = stepValue; + this.name = name; + this.dimSize = dimSize; + this.dimNames = dimNames; + this.dims = dims; + this.sems = sems; + this.dataSize = dataSize; + } + + /** + * Lit le header si possible. Si ce n'est pas possible replace le + * raf a l'emplacement auquel il etait avant la tentative de lecture. + * + * Utilise pour toutes les chaines lu, la representation interne + * pour minimiser le nombre de chaine reellement en memoire + * + * @param raf + * @return + * @throws IOException + */ + public static ResultHeaderMatrix read(RandomAccessFile raf, long offset) throws IOException { + raf.seek(offset); + + long mark = raf.readLong(); + ResultHeaderMatrix result = null; + if (mark != RESULT_MATRIX) { + // on a pas le bon marqueur, on se replace avant sa lecture + raf.seek(offset); + } else { + result = new ResultHeaderMatrix(); + result.stepValue = raf.readInt(); + result.name = raf.readUTF().intern(); + result.dimSize = raf.readInt(); + result.dimNames = new String[result.dimSize]; + for (int i=0; i< result.dimSize; i++) { + result.dimNames[i] = raf.readUTF().intern(); + } + result.dims = new int[result.dimSize]; + for (int i=0; i< result.dimSize; i++) { + result.dims[i] = raf.readInt(); + } + + result.sems = new List[result.dimSize]; + for (int i=0; i< result.dimSize; i++) { + result.sems[i] = new ArrayList(); + for (int j=0; j< result.dims[i]; j++) { + String s = raf.readUTF().intern(); + result.sems[i].add(s); + } + } + result.dataSize = raf.readInt(); + } + return result; + } + public void write (RandomAccessFile raf, long offset) throws IOException { + raf.seek(offset); + long mark = RESULT_MATRIX; + + raf.writeLong(mark); + raf.writeInt(this.stepValue); + raf.writeUTF(this.name); + raf.writeInt(this.dimSize); + for (int i=0; i< this.dimSize; i++) { + raf.writeUTF(this.dimNames[i]); + } + for (int i=0; i< this.dimSize; i++) { + raf.writeInt(this.dims[i]); + } + + + for (int i=0; i< this.sems.length; i++) { + for (Object s : this.sems[i]) { + raf.writeUTF(String.valueOf(s)); + } + } + raf.writeInt(this.dataSize); + } + } + + + + /** read data from file */ + public ResultMapped(MatrixFactory matrixFactory, RandomAccessFile raf, long offset) throws IOException { + this.raf = raf; + this.offset = offset; + ResultHeaderMatrix header = ResultHeaderMatrix.read(raf, offset); + if (header != null) { + step = new TimeStep(header.stepValue); + name = header.name; + String[] dimNames = header.dimNames; + List[] sems = header.sems; + + long dataOffset = raf.getFilePointer(); + long size = raf.getFilePointer() - offset; + + int dataSize = header.dataSize; + + DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); + this.matrix = matrixFactory.create(name, sems, dimNames, data); + + size += dataSize * 8; /* un double est sur 8 bytes*/ + this.size = size; + } + } + + /** write date to file */ + public ResultMapped(RandomAccessFile raf, long offset, + TimeStep step, String name, MatrixND matrix) throws IOException { + this.raf = raf; + this.offset = offset; + this.step = step; + this.name = name; + + String[] dimNames = matrix.getDimensionNames(); + int[] dims = matrix.getDim(); + List[] sems = matrix.getSemantics(); + int dataSize = MatrixHelper.getVectorSize(dims); // en mettant un int on est limite a 2Go x 8 (double) = 16Go par matrice + + // conversion des semantiques + SemanticsDecorator deco = new EntitySemanticsDecorator(); + for (int i=0; i<sems.length; i ++) { + List l = sems[i]; + List undecorate = new ArrayList(l.size()); + sems[i] = undecorate; + for (Object o : l) { + o = deco.undecorate(o); + undecorate.add(o); + } + } + + ResultHeaderMatrix header = new ResultHeaderMatrix(); + header.set(step.getStep(), name, dims.length, dimNames, dims, sems, dataSize); + header.write(raf, offset); + + // on prend la position apres l'ecriture de l'entete + long dataOffset = raf.getFilePointer(); + // on cree la nouvelle matrice comme il faut (semantique non decore) + DoubleBigMappedVector data = new DoubleBigMappedVector(raf, dataOffset, dataSize); + this.matrix = MatrixFactory.getInstance().create(name, sems, dimNames, data); + // et on met les valeurs de l'ancienne dans la nouvelle + this.matrix.paste(matrix); + + // la taille du tout est la longueur du header (position des data - offset) + taille des data + size = dataOffset - offset + dataSize * 8; /* un double est sur 8 bytes*/ + } + + /** + * retourne la taille en nombre de byte + * @return + */ + public long size() { + return size; + } + + public TimeStep getStep() { + return step; + } + + public String getName() { + return name; + } + + public MatrixND getMatrix() { + return matrix; + } + + public MatrixND getMatrix(TopiaContext tx) { + // on met la matrice dans un decorateur pour convertir automatiquement les semantiques + MatrixND result = new MatrixSemanticsDecorator(matrix, new EntitySemanticsDecorator(tx)); + return result; + } + } + + /** + * Les ResultStorage ne doivent pas etre instancier directement, mais + * recuperer a partir d'un + * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultStorage()} + * + * @param simulation storage to get result + */ + public ResultMappedStorage(SimulationStorage simulation) throws IOException { + this.simulation = simulation; + + // instanciation de la factory avec l'implementation + // choisie dans la config + Class vectorClass = IsisFish.config.getMappedResultMatrixVectorClass(); + matrixFactory = MatrixFactory.getInstance(vectorClass); + + File file = SimulationStorage.getResultFile(simulation.getDirectory()); + + // il faut toujours ouvrir en 'rw' car sinon les matrices n'arrive pas + // a ce charger car elle sont toujours en RW. + raf = new RandomAccessFile(file, "rw"); + + // on lit les donnees deja presente + offset = 0; + while (offset < raf.length()) { + ResultMapped r = new ResultMapped(matrixFactory, raf, offset); + storeResult(r); + offset += r.size(); + } + } + + @Override + protected void finalize() throws Throwable { + super.finalize(); + raf.close(); + } + + @Override + public void delete() { + close(); + File file = SimulationStorage.getResultFile(simulation.getDirectory()); + file.delete(); + } + + @Override + public void close() { + if (raf != null) { + IOUtils.closeQuietly(raf); + raf = null; + } + } + + /** + * Methode interne pour que les deux Map soit mise a jour en meme temps + * C'est la seul methode qui permet d'ajouter des noms de result dans les Map + * @param r + */ + protected void storeResult(ResultMapped r) { + TimeStep step = r.getStep(); + String name = r.getName(); + + getResult(step).put(name, r); + Map<TimeStep, ResultMapped> stepResult = nameStepResults.get(name); + if (stepResult == null) { + stepResult = new TreeMap<TimeStep, ResultMapped>(); + nameStepResults.put(name, stepResult); + } + stepResult.put(step, r); + } + + protected Map<String, ResultMapped> getResult(TimeStep step) { + Map<String, ResultMapped> result = stepNameResults.get(step); + if (result == null) { + result = new TreeMap<String, ResultMapped>(); + stepNameResults.put(step, result); + } + return result; + } + + protected ResultMapped getResult(TimeStep step, String name) { + ResultMapped result = getResult(step).get(name); + return result; + } + + protected ResultMapped getResult(TimeStep step, String name, Population pop) { + name += " " + pop; + ResultMapped result = getResult(step, name); + return result; + } + + protected Map<TimeStep, ResultMapped> getResult(String name, Population pop) { + name += " " + pop; + Map<TimeStep, ResultMapped> result = getResult(name); + return result; + } + + protected Map<TimeStep, ResultMapped> getResult(String name) { + Map<TimeStep, ResultMapped> result = nameStepResults.get(name); + if (result == null) { + // on retourne une map vide, pour ne jamais retourne null + result = Collections.EMPTY_MAP; + } + return result; + } + + + public void addResult(TimeStep step, MatrixND mat) throws IsisFishException { + addResult(false, step, mat.getName(), mat); + } + + public void addResult(TimeStep step, Population pop, MatrixND mat) throws IsisFishException { + addResult(false, step, mat.getName(), pop, mat); + } + + public void addResult(boolean force, TimeStep step, MatrixND mat) throws IsisFishException { + addResult(force, step, mat.getName(), mat); + } + + public void addResult(boolean force, TimeStep step, Population pop, MatrixND mat) throws IsisFishException { + addResult(force, step, mat.getName(), pop, mat); + } + + public void addResult(TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { + addResult(false, step, name, pop, mat); + } + + public void addResult(TimeStep step, String name, MatrixND mat) throws IsisFishException { + addResult(false, step, name, mat); + } + + public void addResult(boolean force, TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { + if (force || isEnabled(name)) { + doAddResult(step, name + " " + pop, mat); + } + } + + public void addResult(boolean force, TimeStep step, String name, MatrixND mat) throws IsisFishException { + if (force || isEnabled(name)) { + doAddResult(step, name, mat); + } + } + + protected void doAddResult(TimeStep step, String name, MatrixND mat) throws IsisFishException { + // si la matrice n'a pas de semantique on refuse + for (int i = 0; i < mat.getDimCount(); i++) { + // la semantique n'est pas bonne des qu'il y a un null dedans + if (mat.getSemantic(i).contains(null)) { + throw new SimulationException( + "Erreur le résultat que vous souhaitez enregistrer n'a pas d'information convenable pour la dimension: " + + i + " " + mat.getDimensionName(i)); + } + } + + try { + ResultMapped r = new ResultMapped(raf, offset, step, name, mat); + storeResult(r); + offset += r.size(); + // si on force un sync (ecriture disque) au cas + // ou la simulation plante, on a tout de meme des resultat. Mais + // cela dimini grandement les performances :( On divise par 3 le + // temps de simulation, si on ne force pas le sync. + // raf.getFD().sync(); + } catch (IOException eee) { + log.warn("Can't add result '" + name + "' at step " + step, eee); + } + } + + + + + + + + /** + * Permet de savoir si lorsque l'on ajoutera ce resultat, il sera + * sauvé ou non. + * + * Check for result name returned by : + * <ul> + * <li>{@link Export#getNecessaryResult()}</li> + * <li>{@link SensitivityExport#getNecessaryResult()}</li> + * <li>{@link Rule#getNecessaryResult()}</li> + * <li>{@link SimulationPlan#getNecessaryResult()}</li> + * </ul> + * + * @param name result name + * @return {@code true} if result is enabled + */ + public boolean isEnabled(String name) { + name = name.trim(); + if (enabledResult == null && simulation.getSimulationParametersFile().exists()) { + enabledResult = new HashSet<String>(); + + Collection<String> resultEnabled = simulation.getParameter() + .getResultEnabled(); + enabledResult.addAll(resultEnabled); + + // test on export + List<String> exportNames = simulation.getParameter().getExportNames(); + if (exportNames != null) { + for (String exportName : exportNames) { + ExportStorage storage = ExportStorage.getExport(exportName); + try { + Export export = storage.getNewExportInstance(); + for (String resultName : export.getNecessaryResult()) { + enabledResult.add(resultName); + } + } catch (IsisFishException eee) { + if (log.isWarnEnabled()) { + log.warn(_("isisfish.error.instanciate.export", + exportName), eee); + } + } + } + } + + // test on sensitivity export + List<SensitivityExport> sensitivityExports = simulation + .getParameter().getSensitivityExport(); + if (sensitivityExports != null) { + for (SensitivityExport sensitivityExport : sensitivityExports) { + for (String resultName : sensitivityExport.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + + // test on rules + List<Rule> rules = simulation.getParameter().getRules(); + if (rules != null) { + for (Rule rule : rules) { + for (String resultName : rule.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + + // test on plans + List<SimulationPlan> plans = simulation.getParameter().getSimulationPlans(); + if (plans != null) { + for (SimulationPlan plan : plans) { + for (String resultName : plan.getNecessaryResult()) { + enabledResult.add(resultName); + } + } + } + log.info("Enabled result: " + enabledResult); + } + // par defaut on dit qu'on conserve le resultat + boolean result = true; + if (enabledResult != null) { + result = enabledResult.contains(name); + } + return result; + } + + + public void addActiveRule(TimeStep step, Rule rule) throws IsisFishException { + try { + TopiaContext tx = null; + boolean mustClose = false; + + if (simulation == SimulationContext.get().getSimulationStorage()) { + tx = SimulationContext.get().getDbResult(); + } + if (tx == null) { + // not in simulation, create transaction + tx = simulation.getStorage().beginTransaction(); + mustClose = true; + } + ActiveRuleDAO ps = IsisFishDAOHelper.getActiveRuleDAO(tx); + ActiveRule result = ps.create(); + result.setActiveRuleStep(step); + result.setName(RuleStorage.getName(rule)); + result.setParam(RuleStorage.getParamAsString(rule)); + ps.update(result); + if (mustClose) { + tx.commitTransaction(); + tx.closeContext(); + } + } catch (TopiaException eee) { + throw new IsisFishException("Can't add result", eee); + } + } + + /** + * Retourne la liste de tous les résultats. Si le résultat est categorisé + * par une population alors le nom de la population est automatiquement + * ajouté au nom du résultat. + */ + public List<String> getResultName() { + List<String> result = new ArrayList<String>(nameStepResults.keySet()); + return result; + } + + /** + * Retourne la matrice stocke pour un pas de temps + * @param step le pas de temps que l'on souhaite + * @param pop la population pour lequelle on souhaite le resultat + * @param name le nom des resultats dont on veut la matrice + * @return La matrice demandée ou null si aucune matrice ne correspond a + * la demande. + */ + public MatrixND getMatrix(TimeStep step, Population pop, String name) { + String newName = name + " " + pop; + return getMatrix(step, newName, null); + } + + /** + * Retourne la matrice stocke pour un pas de temps + * @param step le pas de temps que l'on souhaite + * @param pop la population pour lequelle on souhaite le resultat + * @param name le nom des resultats dont on veut la matrice + * @return La matrice demandée ou null si aucune matrice ne correspond a + * la demande. + */ + public MatrixND getMatrix(TimeStep step, Population pop, String name, TopiaContext tx) { + String newName = name + " " + pop; + return getMatrix(step, newName, tx); + } + + public MatrixND getMatrix(TimeStep step, String name) { + return getMatrix(step, name, null); + } + + /** + * Retourne une matrice contenant tous les pas de temps. + * + * @param name le nom des resultats dont on veut une matrice globale. + */ + public MatrixND getMatrix(TimeStep step, String name, TopiaContext tx) { + ResultMapped r = getResult(step, name); + MatrixND mat = null; + if (r != null) { + tx = getTx(tx); + mat = r.getMatrix(tx); + } + return mat; + } + + /** + * Retourne une matrice contenant tous les pas de temps. + * @param pop la population pour lequel on souhaite la matrice + * @param name le nom des resultats dont on veut une matrice globale. + */ + public MatrixND getMatrix(Population pop, String name) { + String newName = name + " " + pop; + return getMatrix(newName, null); + } + + /* (non-Javadoc) + * @see fr.ifremer.isisfish.datastore.ResultStorage#getMatrix(fr.ifremer.isisfish.entities.Population, java.lang.String, org.nuiton.topia.TopiaContext) + */ + @Override + public MatrixND getMatrix(Population pop, String name, TopiaContext tx) { + String newName = name + " " + pop; + return getMatrix(newName, tx); + } + + /** + * Retourne une matrice contenant tous les pas de temps. + * + * @param name le nom des resultats dont on veut une matrice globale. + */ + public MatrixND getMatrix(String name) { + return getMatrix(name, null); + } + + /** + * Retourne une matrice contenant tous les pas de temps. + * @param name le nom des resultats dont on veut une matrice globale. + */ + public MatrixND getMatrix(String name, TopiaContext tx) { + log.debug("Get result: " + name); + + MatrixND resultMat = null; + Map<TimeStep, ResultMapped> results = getResult(name); + // recuperation des resultats qui nous interesse + if (!results.isEmpty()) { + // creation de la liste de date + TimeStep lastStep = getLastStep(); + List<TimeStep> steps = new ArrayList<TimeStep>(); + TimeStep step = new TimeStep(0); + steps.add(step); + while (step.before(lastStep)) { + step = step.next(); + steps.add(step); + } + + if (log.isTraceEnabled()) { + log.trace("Steps list : " + steps); + } + + + MatrixND mat = results.values().iterator().next().getMatrix(); + + // recuperation des noms des dimensions + String[] dimNames = new String[1 + mat.getDimCount()]; + dimNames[0] = _("isisfish.common.date"); + for (int i = 1; i < dimNames.length; i++) { + dimNames[i] = mat.getDimensionName(i - 1); + } + + // creation de la semantique pour la matrice resultat. +1 pour les dates + List[] sem = new List[1 + mat.getDimCount()]; + sem[0] = steps; + + for (int i = 1; i < sem.length; i++) { + sem[i] = new HashList(); + } + + for (ResultMapped result : results.values()) { + MatrixND mattmp = result.getMatrix(); + if (log.isTraceEnabled()) { + log.trace("Ajout de la semantics: " + + Arrays.asList(mattmp.getSemantics())); + } + + for (int s = 0; s < mattmp.getDimCount(); s++) { + sem[s + 1].addAll(mattmp.getSemantic(s)); + } + } + + if (log.isTraceEnabled()) { + log.trace("La semantique final est: " + Arrays.asList(sem)); + } + + // creation de la matrice resultat + resultMat = matrixFactory.create(name, sem, dimNames); + + // recuperation du resultat pour chaque date de la simulation, de Date(0) à lastDate + for (ResultMapped result : results.values()) { + TimeStep d = result.getStep(); + mat = result.getMatrix(); + // on met ce resultat dans la matrice result si besoin + if (mat != null) { + // on recupere dans la matrice resultat l'endroit on il faut + // mettre la matrice + MatrixND submat = resultMat.getSubMatrix(0, d, 1); + // on met les valeur de mat dans la sous matrice extraite + for (MatrixIterator mi = mat.iterator(); mi.next();) { + submat.setValue( + ArrayUtil.concat(new Object[] { d }, + mi.getSemanticsCoordinates()), mi.getValue()); + } + } + } + } + if (resultMat != null) { + // on decore la matrice resultat au dernier moment, tous les calcules + // ce font avec les strings + tx = getTx(tx); + resultMat = new MatrixSemanticsDecorator(resultMat, new EntitySemanticsDecorator(tx)); + } + return resultMat; + } + + /** + * Get last simulation date. + * + * @return last simulation date + */ + public TimeStep getLastStep() { + int monthNumber = simulation.getParameter().getNumberOfYear() + * Month.NUMBER_OF_MONTH; + TimeStep result = new TimeStep(monthNumber - 1); // -1 because date begin at 0 + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) + */ + @Override + public void addResult(SimulationContext context, TimeStep step, String name, + MatrixND mat) throws IsisFishException { + doAddResult(step, name, mat); + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String) + */ + @Override + public MatrixND getMatrix(SimulationContext context, TimeStep step, String name) { + MatrixND result = null; + try { + result = getMatrix(step, name, context.getDB()); + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn(String.format("Can't get result: %1$s", name), eee); + } + } + return result; + + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, java.lang.String) + */ + @Override + public MatrixND getMatrix(SimulationContext context, String name) { + MatrixND result = null; + try { + result = getMatrix(name, context.getDB()); + } catch (TopiaException eee) { + if (log.isWarnEnabled()) { + log.warn(String.format("Can't get result: %1$s", name), eee); + } + } + return result; + } + + /** + * Try to find better tx. If argument is not null, return it. otherwize + * try to get tx in SimulationContext. + * + * @param tx + * @return + */ + protected TopiaContext getTx(TopiaContext tx) { + TopiaContext result = tx; + if (tx == null) { + // si on a pas de tx, on recherche si on est dans une simulation + // pour recuperer la tx de la simulation + if (simulation == SimulationContext.get().getSimulationStorage()) { + try { + result = SimulationContext.get().getDB(); + } catch (TopiaException eee) { + throw new IsisFishRuntimeException("Can't get database from SimulationContext", eee); + } + } + } + return result; + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) + */ + @Override + public void afterSimulation(SimulationContext context) { + } + + /* + * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) + */ + @Override + public void beforeSimulation(SimulationContext context) { + } + + // public void addActivatedRule(ResultStorage self, Date date, RegleParam rule){ + // List rules = (List)activatedRules.get(date); + // if(rules == null){ + // activatedRules.put(date, rules = new LinkedList()); + // } + // rules.add(rule); + // } + + // /** + // * Retourne pour une date données tous les RegleParam qui ont été activé + // * a la date demandé. + // * @return une list de {@link fr.ifremer.nodb.RegleParam} + // */ + // public List getActivatedRule(ResultStorage self, Date date){ + // List rules = (List)activatedRules.get(date); + // if(rules == null){ + // activatedRules.put(date, rules = new LinkedList()); + // } + // return rules; + // } + +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ResultStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,194 +19,29 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.datastore; -import static org.nuiton.i18n.I18n._; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashSet; import java.util.List; -import java.util.Set; -import org.apache.commons.collections.map.ReferenceMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -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.topia.TopiaException; -import org.nuiton.util.ArrayUtil; -import org.nuiton.util.HashList; -import fr.ifremer.isisfish.IsisFishDAOHelper; import fr.ifremer.isisfish.IsisFishException; -import fr.ifremer.isisfish.entities.ActiveRule; -import fr.ifremer.isisfish.entities.ActiveRuleDAO; import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.Result; -import fr.ifremer.isisfish.entities.ResultDAO; import fr.ifremer.isisfish.export.Export; import fr.ifremer.isisfish.export.SensitivityExport; import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.simulator.SimulationException; import fr.ifremer.isisfish.simulator.SimulationPlan; -import fr.ifremer.isisfish.simulator.SimulationResultGetter; import fr.ifremer.isisfish.simulator.SimulationResultListener; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.types.Month; -/** - * Cette classe permet de conserver des résultats de simulation. Elle permet - * ensuite de les récupérer. - * - * Created: 29 sept. 2004 - * - * @author Benjamin Poussin <poussin@codelutin.com> - * @version $Revision$ - * - * Mise a jour: $Date$ - * par : $Author$ - */ -public class ResultStorage implements SimulationResultListener, - SimulationResultGetter { // ResultStorage +public interface ResultStorage extends SimulationResultListener { - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(ResultStorage.class); - - protected SimulationStorage simulation = null; - // transient protected HashMap<String, MatrixND> globalMatrix = new HashMap<String, MatrixND>(); - transient protected ReferenceMap cacheContext = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.WEAK); - - /** cache to maintains some result. key: String(date + ':' + name), value: matrix - * TODO: cache will be more efficient if it keep at min the number of result by year */ - transient protected ReferenceMap cache = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); - /** contains all available result as string: String(date + ':' + name) */ - transient protected Set<String> availableResult = null; - /** result enabled */ - transient protected Set<String> enabledResult = null; - /** - * Les ResultStorage ne doivent pas etre instancier directement, mais - * recuperer a partir d'un - * {@link fr.ifremer.isisfish.datastore.SimulationStorage#getResultStorage()} - * - * @param simulation storage to get result - */ - public ResultStorage(SimulationStorage simulation) { - this.simulation = simulation; - } - - protected void putInCache(TimeStep step, String name, MatrixND mat, TopiaContext context) { - String key = step.getStep() + ":" + name; - putInCache(key, mat, context); - } - - protected void putInCache(String name, MatrixND mat, TopiaContext context) { - if (mat != null) { - cache.put(name, mat); - cacheContext.put(name, context); - } - } - - /** - * Result can be removed from cache when computed result (from multiple step) - * become invalidated by new step result. - * - * @param name result name to remove - */ - protected void removeInCache(String name) { - cache.remove(name); - cacheContext.remove(name); - } - - protected MatrixND getInCache(TimeStep step, String name) { - // do not use toString for step (depend on i18n) - String key = step.getStep() + ":" + name; - MatrixND result = getInCache(key); - return result; - } - - protected MatrixND getInCache(String name) { - MatrixND result = null; - TopiaContext context = (TopiaContext) cacheContext.get(name); - if (context != null && !context.isClosed()) { - // on verifie que le context existe encore car on peut vouloir - // naviguer dans les semantics - result = (MatrixND) cache.get(name); - } - return result; - } - - /** - * Retourne le nom de tous les resultats disponibles le nom est constitué - * de la date et du nom du resultat. - * - * @return available results - */ - protected Set<String> getAvailableResult() { - if (availableResult == null) { - availableResult = new HashSet<String>(); - try { - TopiaContext tx = null; - boolean mustClose = false; - - if (simulation == SimulationContext.get().getSimulationStorage()) { - tx = SimulationContext.get().getDbResult(); - } - - if (tx == null) { - // not in simulation, create transaction - tx = simulation.getStorage().beginTransaction(); - mustClose = true; - } - - List<String> result = (List<String>) tx.find("Select " + Result.PROPERTY_RESULT_STEP + "||':'||name from fr.ifremer.isisfish.entities.Result"); - if (mustClose) { - tx.closeContext(); - } - availableResult.addAll(result); - } catch (Exception eee) { - if (log.isWarnEnabled()) { - log.warn("Can't get result available", eee); - } - } - } - return availableResult; - } - - /** - * Verifie si un resultat est disponible pour une date donnée. - * - * @param step - * @param name - * @return {@code true} if result is available - */ - protected boolean isAvailableResult(TimeStep step, String name) { - String key = step.getStep() + ":" + name; - boolean result = getAvailableResult().contains(key); - return result; - } - - /** - * Ajoute un resultat comme etant disponible pour une date donnée. - * - * @param step - * @param name - */ - protected void addAvailableResult(TimeStep step, String name) { - String key = step.getStep() + ":" + name; - getAvailableResult().add(key); - } - - /** * Permet de savoir si lorsque l'on ajoutera ce resultat, il sera * sauvé ou non. * @@ -221,230 +56,41 @@ * @param name result name * @return {@code true} if result is enabled */ - public boolean isEnabled(String name) { - name = name.trim(); - if (enabledResult == null) { - enabledResult = new HashSet<String>(); + public boolean isEnabled(String name); - Collection<String> resultEnabled = simulation.getParameter() - .getResultEnabled(); - enabledResult.addAll(resultEnabled); + public void addResult(TimeStep step, MatrixND mat) throws IsisFishException; - // test on export - List<String> exportNames = simulation.getParameter().getExportNames(); - if (exportNames != null) { - for (String exportName : exportNames) { - ExportStorage storage = ExportStorage.getExport(exportName); - try { - Export export = storage.getNewExportInstance(); - for (String resultName : export.getNecessaryResult()) { - enabledResult.add(resultName); - } - } catch (IsisFishException eee) { - if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.instanciate.export", - exportName), eee); - } - } - } - } + public void addResult(TimeStep step, Population pop, MatrixND mat) + throws IsisFishException; - // test on sensitivity export - List<SensitivityExport> sensitivityExports = simulation - .getParameter().getSensitivityExport(); - if (sensitivityExports != null) { - for (SensitivityExport sensitivityExport : sensitivityExports) { - for (String resultName : sensitivityExport.getNecessaryResult()) { - enabledResult.add(resultName); - } - } - } + public void addResult(boolean force, TimeStep step, MatrixND mat) + throws IsisFishException; - // test on rules - List<Rule> rules = simulation.getParameter().getRules(); - if (rules != null) { - for (Rule rule : rules) { - for (String resultName : rule.getNecessaryResult()) { - enabledResult.add(resultName); - } - } - } + public void addResult(boolean force, TimeStep step, Population pop, + MatrixND mat) throws IsisFishException; - // test on plans - List<SimulationPlan> plans = simulation.getParameter().getSimulationPlans(); - if (plans != null) { - for (SimulationPlan plan : plans) { - for (String resultName : plan.getNecessaryResult()) { - enabledResult.add(resultName); - } - } - } - log.info("Enabled result: " + enabledResult); - } - boolean result = enabledResult.contains(name); - return result; - } + public void addResult(TimeStep step, String name, Population pop, + MatrixND mat) throws IsisFishException; - public void addResult(TimeStep step, MatrixND mat) throws IsisFishException { - addResult(false, step, mat.getName(), mat); - } + public void addResult(TimeStep step, String name, MatrixND mat) + throws IsisFishException; - public void addResult(TimeStep step, Population pop, MatrixND mat) throws IsisFishException { - addResult(false, step, mat.getName(), pop, mat); - } + public void addResult(boolean force, TimeStep step, String name, + Population pop, MatrixND mat) throws IsisFishException; - public void addResult(boolean force, TimeStep step, MatrixND mat) throws IsisFishException { - addResult(force, step, mat.getName(), mat); - } + public void addResult(boolean force, TimeStep step, String name, + MatrixND mat) throws IsisFishException; - public void addResult(boolean force, TimeStep step, Population pop, MatrixND mat) throws IsisFishException { - addResult(force, step, mat.getName(), pop, mat); - } + public void addActiveRule(TimeStep step, Rule rule) + throws IsisFishException; - public void addResult(TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { - addResult(false, step, name, pop, mat); - } - - public void addResult(TimeStep step, String name, MatrixND mat) throws IsisFishException { - addResult(false, step, name, mat); - } - - public void addResult(boolean force, TimeStep step, String name, Population pop, MatrixND mat) throws IsisFishException { - if (force || isEnabled(name)) { - doAddResult(step, name + " " + pop, mat); - } - } - - public void addResult(boolean force, TimeStep step, String name, MatrixND mat) throws IsisFishException { - if (force || isEnabled(name)) { - doAddResult(step, name, mat); - } - } - - protected void doAddResult(TimeStep step, String name, MatrixND mat) throws IsisFishException { - try { - TopiaContext tx = null; - boolean mustClose = false; - - if (simulation == SimulationContext.get().getSimulationStorage()) { - tx = SimulationContext.get().getDbResult(); - } - if (tx == null) { - // not in simulation, create transaction - tx = simulation.getStorage().beginTransaction(); - mustClose = true; - } - doAddResult(step, name, mat, tx); - if (mustClose) { - tx.commitTransaction(); - tx.closeContext(); - } - } catch (TopiaException eee) { - log.warn("Can't add result '" + name + "' at step " + step, eee); - } - } - - protected void doAddResult(TimeStep step, String name, MatrixND mat, - TopiaContext tx) throws IsisFishException { - // si la matrice n'a pas de semantique on refuse - for (int i = 0; i < mat.getDimCount(); i++) { - // la semantique n'est pas bonne des qu'il y a un null dedans - if (mat.getSemantic(i).contains(null)) { - throw new SimulationException( - "Erreur le résultat que vous souhaitez enregistrer n'a pas d'information convenable pour la dimension: " - + i + " " + mat.getDimensionName(i)); - } - } - - // on fait une copie pour avoir reellement des resultats independant - MatrixND newMat = mat.copy(); - try { - ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); - Result result = resultPS.create(); - result.setResultStep(step); - result.setName(name); - result.setMatrix(newMat); - resultPS.update(result); - - addAvailableResult(step, name); - putInCache(step, name, newMat, tx); - - // remove from cache result computed by #getMatrix(name) - // beacause, if a new step is added, result become false - // but DO NOT REMOVE result named step + name - removeInCache(name); - - } catch (TopiaException eee) { - log.warn("Can't add result '" + name + "' at step " + step, eee); - } - } - - public void addActiveRule(TimeStep step, Rule rule) throws IsisFishException { - try { - TopiaContext tx = null; - boolean mustClose = false; - - if (simulation == SimulationContext.get().getSimulationStorage()) { - tx = SimulationContext.get().getDbResult(); - } - if (tx == null) { - // not in simulation, create transaction - tx = simulation.getStorage().beginTransaction(); - mustClose = true; - } - ActiveRuleDAO ps = IsisFishDAOHelper.getActiveRuleDAO(tx); - ActiveRule result = ps.create(); - result.setActiveRuleStep(step); - result.setName(RuleStorage.getName(rule)); - result.setParam(RuleStorage.getParamAsString(rule)); - ps.update(result); - if (mustClose) { - tx.commitTransaction(); - tx.closeContext(); - } - } catch (TopiaException eee) { - throw new IsisFishException("Can't add result", eee); - } - } - /** * Retourne la liste de tous les résultats. Si le résultat est categorisé * par une population alors le nom de la population est automatiquement * ajouté au nom du résultat. */ - public List<String> getResultName() { + public List<String> getResultName(); - List<String> result = null; - try { - TopiaContext tx = null; - boolean mustClose = false; - - if (simulation == SimulationContext.get().getSimulationStorage()) { - tx = SimulationContext.get().getDbResult(); - } - if (tx == null) { - // not in simulation, create transaction - tx = simulation.getStorage().beginTransaction(); - mustClose = true; - } - ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); - - result = (List<String>) resultPS.getContext() - .find("Select distinct name from fr.ifremer.isisfish.entities.Result order by name"); - if (mustClose) { - tx.closeContext(); - } - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't get result name", eee); - } - } - if (result == null) { - result = new ArrayList<String>(); - } - return result; - } - /** * Retourne la matrice stocke pour un pas de temps * @param step le pas de temps que l'on souhaite @@ -453,45 +99,10 @@ * @return La matrice demandée ou null si aucune matrice ne correspond a * la demande. */ - public MatrixND getMatrix(TimeStep step, Population pop, String name) { - String newName = name + " " + pop; - return getMatrix(step, newName); - } + public MatrixND getMatrix(TimeStep step, Population pop, String name); - public MatrixND getMatrix(TimeStep step, String name) { - MatrixND mat = getInCache(step, name); - if (mat == null && isAvailableResult(step, name)) { - try { - TopiaContext tx = null; - boolean mustClose = false; + public MatrixND getMatrix(TimeStep step, String name); - if (simulation == SimulationContext.get().getSimulationStorage()) { - tx = SimulationContext.get().getDbResult(); - } - if (tx == null) { - // not in simulation, create transaction - tx = simulation.getStorage().beginTransaction(); - mustClose = true; - } - mat = getMatrix(step, name, tx); - if (mustClose) { - // FIXME transaction never closed - // quand peut on fermer la transaction ? - // lorsque plus aucune matrice ne l'utilise. - // donc mettre la matrice et la connexion dans une map - // la matrice dans une weak reference. Des que la matrice - // est liberer faire un close sur la transaction - } - } catch (Exception eee) { - if (log.isWarnEnabled()) { - log.warn("Can't return matrix '" + name + "' for step " - + step, eee); - } - } - } - return mat; - } - /** * Retourne la matrice stocke pour un pas de temps. * @@ -501,37 +112,14 @@ * @return La matrice demandée ou {@code null} si aucune matrice ne correspond a * la demande. */ - public MatrixND getMatrix(TimeStep step, String name, TopiaContext tx) { - MatrixND mat = getInCache(step, name); - if (mat == null && isAvailableResult(step, name)) { - try { - ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); - Result result = resultPS.findByProperties( - Result.PROPERTY_RESULT_STEP, step, - Result.PROPERTY_NAME, name); - if (result != null) { - mat = result.getMatrix(); - putInCache(step, name, mat, tx); - } - } catch (Exception eee) { - if (log.isWarnEnabled()) { - log.warn("Can't return matrix '" + name + "' for step " - + step, eee); - } - } - } - return mat; - } + public MatrixND getMatrix(TimeStep step, String name, TopiaContext tx); /** * Retourne une matrice contenant tous les pas de temps. * @param pop la population pour lequel on souhaite la matrice * @param name le nom des resultats dont on veut une matrice globale. */ - public MatrixND getMatrix(Population pop, String name) { - String newName = name + " " + pop; - return getMatrix(newName); - } + public MatrixND getMatrix(Population pop, String name); /** * Retourne une matrice contenant tous les pas de temps. @@ -540,240 +128,42 @@ * @param tx la transaction a utiliser * @since 4.1.0.0 */ - public MatrixND getMatrix(Population pop, String name, TopiaContext tx) { - String newName = name + " " + pop; - return getMatrix(newName, tx); - } + public MatrixND getMatrix(Population pop, String name, TopiaContext tx); /** * Retourne une matrice contenant tous les pas de temps. * @param name le nom des resultats dont on veut une matrice globale. */ - public MatrixND getMatrix(String name) { - MatrixND resultMat = null; - try { - TopiaContext tx = null; - boolean mustClose = false; + public MatrixND getMatrix(String name); - if (simulation == SimulationContext.get().getSimulationStorage()) { - tx = SimulationContext.get().getDbResult(); - } - if (tx == null) { - // not in simulation, create transaction - tx = simulation.getStorage().beginTransaction(); - mustClose = true; - } - resultMat = getMatrix(name, tx); - if (mustClose) { - // FIXME transaction never closed - // quand peut on fermer la transaction ? - // lorsque plus aucune matrice ne l'utilise. - // donc mettre la matrice et la connexion dans une map - // la matrice dans une weak reference. Des que la matrice - // est liberer faire un close sur la transaction - } - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't get result: " + name, eee); - } - } - return resultMat; - } - /** * Retourne une matrice contenant tous les pas de temps. * @param name le nom des resultats dont on veut une matrice globale. * @param tx TopiaContext a utiliser pour recuperer les resultats et donc les semantiques */ - public MatrixND getMatrix(String name, TopiaContext tx) { - log.debug("Get result: " + name); + public MatrixND getMatrix(String name, TopiaContext tx); - MatrixND resultMat = getInCache(name); - if (resultMat != null) { - return resultMat; - } - - // recuperation des resultats qui nous interesse - List<Result> results = null; - try { - ResultDAO resultPS = IsisFishDAOHelper.getResultDAO(tx); - results = resultPS.findAllByName(name); - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn("Can't get result: " + name, eee); - } - } - - // s'il n'y pas de resultat, on retourne null - if (results == null || results.size() == 0) { - return null; - } - - // Creation des listes pour chaque dimension - - // creation de la liste de date - TimeStep lastStep = getLastStep(); - List<TimeStep> steps = new ArrayList<TimeStep>(); - TimeStep step = new TimeStep(0); - steps.add(step); - while (step.before(lastStep)) { - step = step.next(); - steps.add(step); - } - - if (log.isTraceEnabled()) { - log.trace("Steps list : " + steps); - } - - // recuperation des dimensions des matrices - MatrixND mat = (MatrixND) results.get(0).getMatrix(); - - // recuperation des noms des dimensions - String[] dimNames = new String[1 + mat.getDimCount()]; - dimNames[0] = _("isisfish.common.date"); - for (int i = 1; i < dimNames.length; i++) { - dimNames[i] = mat.getDimensionName(i - 1); - } - - // creation de la semantique pour la matrice resultat. +1 pour les dates - List[] sem = new List[1 + mat.getDimCount()]; - sem[0] = steps; - - for (int i = 1; i < sem.length; i++) { - sem[i] = new HashList(); - } - - for (Result result : results) { - MatrixND mattmp = result.getMatrix(); - if (log.isTraceEnabled()) { - log.trace("Ajout de la semantics: " - + Arrays.asList(mattmp.getSemantics())); - } - - for (int s = 0; s < mattmp.getDimCount(); s++) { - sem[s + 1].addAll(mattmp.getSemantic(s)); - } - } - - if (log.isTraceEnabled()) { - log.trace("La semantique final est: " + Arrays.asList(sem)); - } - - // creation de la matrice resultat - resultMat = MatrixFactory.getInstance().create(name, sem, dimNames); - - // recuperation du resultat pour chaque date de la simulation, de Date(0) à lastDate - for (Result result : results) { - TimeStep d = result.getResultStep(); - mat = result.getMatrix(); - // on met ce resultat dans la matrice result si besoin - if (mat != null) { - // on recupere dans la matrice resultat l'endroit on il faut - // mettre la matrice - MatrixND submat = resultMat.getSubMatrix(0, d, 1); - // on met les valeur de mat dans la sous matrice extraite - for (MatrixIterator mi = mat.iterator(); mi.next();) { - submat.setValue( - ArrayUtil.concat(new Object[] { d }, - mi.getSemanticsCoordinates()), mi.getValue()); - } - } - } - - putInCache(name, resultMat, tx); - return resultMat; - } - /** * Get last simulation date. * * @return last simulation date */ - public TimeStep getLastStep() { - int monthNumber = simulation.getParameter().getNumberOfYear() - * Month.NUMBER_OF_MONTH; - TimeStep result = new TimeStep(monthNumber - 1); // -1 because date begin at 0 - return result; - } + public TimeStep getLastStep(); - /* - * @see fr.ifremer.isisfish.simulator.SimulationResultListener#addResult(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String, org.nuiton.math.matrix.MatrixND) + /** + * Delete all result for this result storage. + * + * In case of sensitivity analysis, after export, result are no longer + * needed and can be deleted to save disk space. + * + * @since 4.1.1.2 */ - @Override - public void addResult(SimulationContext context, TimeStep step, String name, - MatrixND mat) throws IsisFishException { - try { - doAddResult(step, name, mat, context.getDbResult()); - } catch (TopiaException eee) { - log.warn(_("Can't add result '%1$s' at date %2$s", name, step), eee); - } - } + public void delete(); - /* - * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, fr.ifremer.isisfish.types.TimeStep, java.lang.String) + /** + * Close result storage. + * + * @since 4.1.1.2 */ - @Override - public MatrixND getMatrix(SimulationContext context, TimeStep step, String name) { - MatrixND result = null; - try { - result = getMatrix(step, name, context.getDbResult()); - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn(_("Can't get result: %1$s", name), eee); - } - } - return result; - } - - /* - * @see fr.ifremer.isisfish.simulator.SimulationResultGetter#getMatrix(fr.ifremer.isisfish.simulator.SimulationContext, java.lang.String) - */ - @Override - public MatrixND getMatrix(SimulationContext context, String name) { - MatrixND result = null; - try { - result = getMatrix(name, context.getDbResult()); - } catch (TopiaException eee) { - if (log.isWarnEnabled()) { - log.warn(_("Can't get result: %1$s", name), eee); - } - } - return result; - } - - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#afterSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ - @Override - public void afterSimulation(SimulationContext context) { - } - - /* - * @see fr.ifremer.isisfish.simulator.SimulationListener#beforeSimulation(fr.ifremer.isisfish.simulator.SimulationContext) - */ - @Override - public void beforeSimulation(SimulationContext context) { - } - - // public void addActivatedRule(ResultStorage self, Date date, RegleParam rule){ - // List rules = (List)activatedRules.get(date); - // if(rules == null){ - // activatedRules.put(date, rules = new LinkedList()); - // } - // rules.add(rule); - // } - - // /** - // * Retourne pour une date données tous les RegleParam qui ont été activé - // * a la date demandé. - // * @return une list de {@link fr.ifremer.nodb.RegleParam} - // */ - // public List getActivatedRule(ResultStorage self, Date date){ - // List rules = (List)activatedRules.get(date); - // if(rules == null){ - // activatedRules.put(date, rules = new LinkedList()); - // } - // return rules; - // } - -} // ResultStorage + public void close(); +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/RuleStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/ScriptStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SensitivityExportStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationInformation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationPlanStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2005 - 2011 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2005 - 2012 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -43,6 +43,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.util.FileUtil; +import org.nuiton.util.Version; import org.nuiton.util.ZipUtil; import fr.ifremer.isisfish.IsisFish; @@ -74,6 +75,7 @@ public static final String CONTROL_FILENAME = "control"; public static final String PARAMETERS_FILENAME = "parameters.properties"; public static final String RESULT_XML_FILENAME = "isis-mexico-output.xml"; + public static final String RESULT_FILENAME = "results.mapped"; public static final String RESULT_EXPORT_DIRECTORY = "resultExports"; public static final String DESIGN_PLAN_FILENAME = "isis-mexico-designplan.xml"; public static final String SENSITIVITY_RESULTS = "sensitivityresults"; @@ -183,7 +185,7 @@ /** * Retourne le fichier de stockage des inforations de la simulation. - * + * * @param root le repertoire de stockage de la simulation * @return information file */ @@ -195,7 +197,7 @@ /** * Retourne le fichier de stockage des resultats sous format XML mexico * de la simulation. - * + * * @param root le repertoire de stockage de la simulation * @return mexico xml file */ @@ -205,6 +207,18 @@ } /** + * Retourne le fichier de stockage des resultats + * de la simulation. + * + * @param root le repertoire de stockage de la simulation + * @return + */ + public static File getResultFile(File root) { + File result = new File(root, RESULT_FILENAME); + return result; + } + + /** * Retourne le fichier de stockage des parametres de la simulation courante. * * @return parameter file @@ -431,13 +445,32 @@ } /** - * Get simulation {@link ResultStorage}. + * Get simulation {@link ResultDatabaseStorage}. * - * @return le {@link ResultStorage} a utiliser pour cette simulation + * @return le {@link ResultDatabaseStorage} a utiliser pour cette simulation + * @throws StorageException */ - public ResultStorage getResultStorage() { + public ResultStorage getResultStorage() throws StorageException { if (resultStorage == null) { - resultStorage = new ResultStorage(this); + + // depuis la version 4.2.0.0 le stockage a changé de base + // de données à fichier mappe pour les resultat + // mais il faut pouvoir relire les anciennes simulations + SimulationParameter param = getParameter(); + String isisFishVersion = param.getIsisFishVersion(); + Version simuVersion = new Version(isisFishVersion); + Version version4200 = new Version(4, 2, 0, 0); + + // instancier un ResultStorage ou un ResultMappedStorage + if (simuVersion.before(version4200)) { + resultStorage = new ResultDatabaseStorage(this); + } else { + try { + resultStorage = new ResultMappedStorage(this); + } catch (IOException ex) { + throw new StorageException("Can't get storage", ex); + } + } } return resultStorage; } @@ -697,12 +730,12 @@ SimulationStorage result = new SimulationStorage(simDir, name, null); File data = result.getDataBackupFile(); - // FIXME was file.exists() ? if (data.exists()) { - TopiaContext tx = result.getStorage().beginTransaction(); + TopiaContext root = result.getStorage(); + TopiaContext tx = root.beginTransaction(); tx.restore(data); tx.commitTransaction(); - tx.closeContext(); + root.closeContext(); } return result; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/SimulatorStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -48,9 +48,9 @@ * by : $Author$ */ public class SimulatorStorage extends JavaSourceStorage { - + public static final String SIMULATOR_PATH = "simulators"; - + /** Template freemarker pour les scripts. */ public static final String SIMULATOR_TEMPLATE = "templates/script/simulator.ftl"; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeEvent.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeEvent.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeEvent.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageChangeListener.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageException.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/StorageHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/VersionStorage.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/DatabaseMigrationClass.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,7 +1,5 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% @@ -9,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -51,6 +49,7 @@ protected static final Version VERSION_33 = new Version("3.3"); protected static final Version VERSION_40 = new Version("4.0"); protected static final Version VERSION_41 = new Version("4.1"); + protected static final Version VERSION_421 = new Version("4.2.1"); public DatabaseMigrationClass() { super(new MigrationResolver()); @@ -72,6 +71,8 @@ result = MigrationV33V40.class; } else if (version.equals(VERSION_41)) { result = MigrationV40V41.class; + } else if (version.equals(VERSION_421)) { + result = MigrationV41V421.class; } return result; } @@ -83,7 +84,7 @@ */ @Override public Version[] getAvailableVersions() { - Version[] result = new Version[] { VERSION_32, VERSION_33, VERSION_40, VERSION_41 }; + Version[] result = new Version[] { VERSION_32, VERSION_33, VERSION_40, VERSION_41, VERSION_421}; return result; } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV0V32.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,7 +1,5 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% @@ -9,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV32V33.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,7 +1,5 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% @@ -9,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV33V40.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,7 +1,5 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% @@ -9,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -105,6 +103,10 @@ tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATION VARCHAR(255);"); tx.executeSQL("alter table POPULATION add column CAPTURABILITYEQUATIONUSED BIT default false;"); + // migration v 4.1.2 (mais necessaire de la faire avant sinon le findByTopiaId va planter + tx.executeSQL("alter table POPULATION add column groupmin integer default 0"); + tx.executeSQL("alter table POPULATION add column groupmax integer default 0"); + // build new equation for maturity group for (Object[] maturityRow : maturityGroupResult) { String population = (String)maturityRow[0]; @@ -120,7 +122,7 @@ } // build new equation for maturity group and reproduction rate - List<Population> pops = tx.find("from " + Population.class.getName()); + List<Population> pops = tx.findAll("from " + Population.class.getName()); for (Population pop : pops) { String content = getReproductionRateContent(pop, reproductionResults); ((PopulationImpl)pop).setReproductionRateEquationContent(content); @@ -129,7 +131,7 @@ // start equation migration if (IsisFish.config.isLaunchUI()) { - List<Equation> equations = tx.find("from " + Equation.class.getName()); + List<Equation> equations = tx.findAll("from " + Equation.class.getName()); for (Equation equation : equations) { // empty is empty and stay empty Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV40V41.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,7 +1,5 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% @@ -9,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java (from rev 3799, trunk/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/MigrationV41V421.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,68 @@ +/* + * #%L + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Codelutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.datastore.migration; + +import java.util.List; + +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion; +import org.nuiton.util.Version; + +/** + * Migration between version 4.1 and 4.2.1. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class MigrationV41V421 extends MigrationCallBackForVersion { + + /** + * Constructor. + * + * @param version version + * @param callback callback + */ + public MigrationV41V421(Version version, TopiaMigrationCallbackByClass callback) { + super(version, callback); + } + + /* + * @see org.nuiton.topia.migration.TopiaMigrationCallbackByClass.MigrationCallBackForVersion#prepareMigrationScript(org.nuiton.topia.framework.TopiaContextImplementor, java.util.List, boolean, boolean) + */ + @Override + protected void prepareMigrationScript(TopiaContextImplementor tx, + List<String> queries, boolean showSql, boolean showProgression) + throws TopiaException { + + // utilisation du if not exists parce que potentiellement + // déjà fait un v 4.0 + queries.add("alter table POPULATION add column IF NOT EXISTS groupmin integer default 0"); + queries.add("alter table POPULATION add column IF NOT EXISTS groupmax integer default 0"); + } +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/migration/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/ImportFromV2.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/datastore/update/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/CellImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EffortDescriptionImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/EquationImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/FisheryRegionImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/Formule.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/Formule.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/Formule.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/GearImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/MetierSeasonInfoImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationGroupImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PopulationSeasonInfoImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/PortImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SeasonImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SelectivityImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SetOfVesselsImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/SpeciesImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/StrategyMonthInfoImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TargetSpeciesImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/TripTypeImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableType.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VariableType.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/VesselTypeImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/ZoneImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/entities/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/EmigrationEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/ImmigrationEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/Language.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/Language.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/Language.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/MigrationEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationCapturabilityEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationCapturabilityEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationCapturabilityEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowth.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationGrowthReverse.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMaturityOgiveEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationMeanWeight.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationNaturalDeathRate.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationPrice.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/PopulationReproductionRateEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/SelectivityEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/SoVTechnicalEfficiencyEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/StrategyInactivityEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/TargetSpeciesTargetFactorEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/VariableEquation.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/VariableEquation.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/equation/VariableEquation.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/Export.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/Export.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/Export.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/ExportHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -32,18 +32,14 @@ import java.util.List; import java.util.Properties; -import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; -import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.ExportStorage; -import fr.ifremer.isisfish.datastore.SensitivityExportStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.StorageHelper; -import fr.ifremer.isisfish.util.ConverterUtil; /** * Helper for exports manipulation. Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/SensitivityExport.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/SensitivityExport.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/export/SensitivityExport.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/LogLevelUtil.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/SimulationLoggerUtil.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,13 +19,12 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.logging; -import fr.ifremer.isisfish.IsisConfig; import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishException; import fr.ifremer.isisfish.datastore.SimulationStorage; @@ -278,4 +277,4 @@ // and remove it from the logger logger.removeAppender(app); } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/ThreadFilter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsole.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -451,4 +451,4 @@ } logMail.setVisible(true); } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogConsoleModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/console/LogMail.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/FileOffsetReader.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -168,4 +168,4 @@ } } } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReader.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/LineReaderUtil.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/MemoryOffsetReader.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -87,4 +87,4 @@ sb.append("(capacity:").append(capacity).append(", nbLines:").append(getNbLines()).append(')'); return sb.toString(); } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/logging/io/OffsetReader.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CellSelectionLayer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Coordinate.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Coordinate.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/CopyMapToClipboardListener.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMap.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMap.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMapInfo.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMapList.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DataMapList.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DefaultDataMap.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/DefaultScale.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/IsisMapBean.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Motif.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Motif.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Motif.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ResultatLayer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Scale.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Scale.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/Scale.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/map/ZoneDelimiterLayer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/MexicoHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -45,6 +45,8 @@ import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtilsBean; +import org.apache.commons.io.FileUtils; +import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.logging.Log; @@ -59,6 +61,7 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; +import org.omg.CosNaming.NamingContextExtPackage.StringNameHelper; import org.xml.sax.InputSource; import fr.ifremer.isisfish.IsisFishDAOHelper; @@ -107,7 +110,20 @@ designPlanXml = MexicoHelper.formatXML(designPlanXml); return designPlanXml; + } + /** + * Convert design plan to xml and write it to given file. + * + * @param designPlan + */ + public static void writeDesignPlanToFile(File file, DesignPlan designPlan) { + String content = getDesignPlanAsXML(designPlan); + try { + FileUtils.writeStringToFile(file, content); + } catch (IOException ex) { + throw new IsisFishRuntimeException("Can't export factors to xml file", ex); + } } /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionEntityVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionEntityVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionEntityVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExplorer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,14 +19,13 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.mexico.export; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.persistence.HorizontalEntityVisitor; import fr.ifremer.isisfish.entities.Cell; import fr.ifremer.isisfish.entities.FisheryRegion; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExport.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExport.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExport.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/RegionExportFactorXML.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/export/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/AbstractXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/AbstractXMLVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/AbstractXMLVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/ContinuousDomainXMLVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DesignPlanXMLVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DiscreteDomainXMLVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomXMLParser.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/DomainXMLVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/EquationDiscreteDomainXMLVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorGroupXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorGroupXMLVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorGroupXMLVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/FactorXMLVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/RuleDiscreteDomainXMLVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/mexico/xml/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/AbstractRule.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/Rule.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/RuleHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/rule/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlan.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanContext.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanIndependent.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanIndependent.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/AnalysePlanIndependent.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/MetierMonitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -269,7 +269,7 @@ TopiaContext tx = metier.getTopiaContext(); List<StrategyMonthInfo> res = null; // FIXME, c faux car il ne faut prendre que les str selectionnée pour la simulation - res = tx.find("select * from fr.ifremer.isisfish.entities.StrategyMonthInfo where strategyMonthInfo.month=?", + res = tx.findAll("select * from fr.ifremer.isisfish.entities.StrategyMonthInfo where strategyMonthInfo.month=?", month, metier); for(StrategyMonthInfo smi : res){ @@ -298,7 +298,7 @@ TopiaContext tx = metier.getTopiaContext(); List<SetOfVessels> res = null; // FIXME, c faux car il ne faut prendre que les str selectionnée pour la simulation - res = tx.find("select setOfVessels from fr.ifremer.isisfish.entities.EffortDescription where possibleMetiers=?", + res = tx.findAll("select setOfVessels from fr.ifremer.isisfish.entities.EffortDescription where possibleMetiers=?", metier); for(SetOfVessels sov : res){ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/PopulationMonitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/ResultManager.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -110,7 +110,7 @@ * Permet de savoir si lorsque l'on ajoutera ce resultat, il sera * sauvé ou non. */ - public boolean isEnabled(String name){ + public boolean isEnabled(String name) { name = name.trim(); if (enabledResult == null) { SimulationParameter param = context.getSimulationStorage().getParameter(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/RuleMonitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationContext.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,35 +19,29 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.simulator; import java.io.File; -import java.io.FileWriter; -import java.io.IOException; -import java.io.Writer; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; -import org.apache.commons.beanutils.BeanUtils; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; -import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.entities.Variable; import fr.ifremer.isisfish.simulator.sensitivity.SensitivityUtils; import fr.ifremer.isisfish.types.TimeStep; +import fr.ifremer.isisfish.util.Cache; +import fr.ifremer.isisfish.util.Trace; /** * Keep all information on one simulation. @@ -81,6 +75,10 @@ protected Set<SimulationListener> simulationListeners = new LinkedHashSet<SimulationListener>(); protected ClassLoader classLoader = null; protected File scriptDirectory; + /** l'objet trace qui conserve les donnees statistiques des appels de methodes */ + protected Trace trace; + /** cache used by aspect for this simulation */ + protected Cache cache; /** TopiaContext must be used by rule action to modify data */ protected TopiaContext db = null; @@ -88,7 +86,7 @@ /** TopiaContext must be used to save result */ protected TopiaContext dbResult = null; - /** Cache des variables d'entités. Topia id > map of attributes. */ + /** CacheAspect des variables d'entités. Topia id > map of attributes. */ protected Map<TopiaEntity, SimulationVariable> variablesCache = new HashMap<TopiaEntity, SimulationVariable>(); /** Context value used in equation. */ @@ -116,6 +114,10 @@ */ public static void remove() { SimulationContext current = get(); + current.getCache().clear(); + current.cache = null; + current.getTrace().clear(); + current.trace = null; current.values.clear(); current.classLoader = null; simulationContext.remove(); @@ -199,6 +201,19 @@ this.classLoader = classLoader; } + public Trace getTrace() { + if (trace == null) { + trace = new Trace(); + } + return trace; + } + + public Cache getCache() { + if (cache == null) { + cache = new Cache(); + }return cache; + } + /** * Permet de recuperer une valeur prealablement stocker avec un setValue * @param name le nom de la valeur souhaitée @@ -313,6 +328,17 @@ } /** + * Clear isis fish cache for specified time step. + * + * @param step time step to remove data + * @since 4.1.1.0 + * @throws TopiaException + */ + public void clearCache(TimeStep step) throws TopiaException { + getCache().clear(step); + } + + /** * @return Returns the scriptDirectory. */ public File getScriptDirectory() { @@ -322,7 +348,7 @@ /** * Script directory to use. * - * Used to chnage isis-database-3 directory in running simulation context. + * Used to change isis-database-3 directory in running simulation context. * * @param scriptDirectory */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationControl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationException.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationExportResultWrapper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,12 +19,13 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.simulator; +import static org.nuiton.i18n.I18n._; import java.io.File; import java.util.ArrayList; import java.util.List; @@ -66,9 +67,10 @@ SimulationStorage simulation = context.getSimulationStorage(); SimulationParameter parameters = simulation.getParameter(); File rootDirectory = simulation.getDirectory(); + SimulationControl control = context.getSimulationControl(); // Ici on contantene les 2 listes d'exports - + // first, make export instances based on export // names List<Export> allExports = new ArrayList<Export>(); @@ -95,6 +97,7 @@ // make exports if (!allExports.isEmpty()) { + control.setText(_("isisfish.message.export.export")); File exportDir = SimulationStorage .getResultExportDirectory(rootDirectory); exportDir.mkdirs(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationListener.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationListener.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationMeta.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.simulator; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2010 - 2012 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -96,30 +96,30 @@ * * @return Description property. */ - public abstract String getDescription(); + public String getDescription(); /** * Set simulation description. * * @param description the description to set. */ - public abstract void setDescription(String description); + public void setDescription(String description); /** * Load region corresponding to {@link #getRegionName()}. * * @return the region */ - public abstract RegionStorage getRegion(); + public RegionStorage getRegion(); - public abstract MatrixND getNumberOf(Population pop); + public MatrixND getNumberOf(Population pop); /** * Get extra rules list. * * @return Returns the extraRules. */ - public abstract List<String> getExtraRules(); + public List<String> getExtraRules(); /** * Add extra rules. @@ -129,19 +129,19 @@ * * @param extraRules extra rules to add */ - public abstract void addExtraRules(String... extraRules); + public void addExtraRules(String... extraRules); /** * Get instantiated population list. * * @return Returns the populations. */ - public abstract List<Population> getPopulations(); + public List<Population> getPopulations(); /** * @param populations The populations to set. */ - public abstract void setPopulations(List<Population> populations); + public void setPopulations(List<Population> populations); /** * Get instantiated strategies list. @@ -150,21 +150,21 @@ * * @return Returns the strategies. */ - public abstract List<Strategy> getStrategies(); + public List<Strategy> getStrategies(); /** * Set strategies list. * * @param strategies strategies list to set */ - public abstract void setStrategies(List<Strategy> strategies); + public void setStrategies(List<Strategy> strategies); /** * Add new simulation plan. * * @param plan simulation plan to add */ - public abstract void addSimulationPlan(SimulationPlan plan); + public void addSimulationPlan(SimulationPlan plan); /** * Remove a plan. @@ -172,7 +172,7 @@ * @param plan * @return {@code true} if this list contained the specified element */ - public abstract boolean removeSimulationPlan(SimulationPlan plan); + public boolean removeSimulationPlan(SimulationPlan plan); /** * Get instantiated simulation plan list. @@ -181,32 +181,32 @@ * * @return the plans. */ - public abstract List<SimulationPlan> getSimulationPlans(); + public List<SimulationPlan> getSimulationPlans(); /** * Set plans list. * * @param plans plans to set */ - public abstract void setSimulationPlans(List<SimulationPlan> plans); + public void setSimulationPlans(List<SimulationPlan> plans); /** * Return {@code true} if simulation is composed of independent plan only. * * @return {@code true} if all {@link SimulationPlan} are {@link SimulationPlanIndependent} */ - public abstract boolean isIndependentPlan(); + public boolean isIndependentPlan(); /** * Clear plan list. */ - public abstract void clearPlans(); + public void clearPlans(); /** * Add new rule to rules list. * @param rule rule to add */ - public abstract void addRule(Rule rule); + public void addRule(Rule rule); /** * Remove a rule. @@ -214,26 +214,26 @@ * @param rule rule to remove * @return {@code true} if this list contained the specified element */ - public abstract boolean removeRule(Rule rule); + public boolean removeRule(Rule rule); /** * Get parameters rules list. * * @return the rules */ - public abstract List<Rule> getRules(); + public List<Rule> getRules(); /** * Set simulation rules. * * @param rules rules to set */ - public abstract void setRules(List<Rule> rules); + public void setRules(List<Rule> rules); /** * Clear rule list. */ - public abstract void clearRules(); + public void clearRules(); /** * Return if optimization sould be used. @@ -242,14 +242,14 @@ * * @return use optimization */ - public abstract boolean getUseOptimization(); + public boolean getUseOptimization(); /** * Change use optimization parameter. * * @param useOptimization use optimization to set */ - public abstract void setUseOptimization(boolean useOptimization); + public void setUseOptimization(boolean useOptimization); /** * Return if statistic sould be used. @@ -258,28 +258,28 @@ * * @return use statistic */ - public abstract boolean getUseStatistic(); + public boolean getUseStatistic(); /** * Change use statistic property. * * @param useStatistic use statistic to set */ - public abstract void setUseStatistic(boolean useStatistic); + public void setUseStatistic(boolean useStatistic); /** * Get export names list. * * @return export names list */ - public abstract List<String> getExportNames(); + public List<String> getExportNames(); /** * Set export names list. * * @param exportNames export names list to set */ - public abstract void setExportNames(List<String> exportNames); + public void setExportNames(List<String> exportNames); /** * Get number of sensitivity simulation. @@ -288,44 +288,59 @@ * * @return the numberOfSensitivitySimulation */ - public abstract int getNumberOfSensitivitySimulation(); + public int getNumberOfSensitivitySimulation(); /** * Set number of sensitivity simulation. * * @param numberOfSensitivitySimulation number of sensitivity simulation to set */ - public abstract void setNumberOfSensitivitySimulation( + public void setNumberOfSensitivitySimulation( int numberOfSensitivitySimulation); /** - * Get instantiated sensitivity calculator. + * Get instantiated sensitivity analysis. * * Default to : null. * * @return the sensitivityAnalysis */ - public abstract SensitivityAnalysis getSensitivityAnalysis(); + public SensitivityAnalysis getSensitivityAnalysis(); /** * @param sensitivityAnalysis the sensitivityAnalysis to set */ - public abstract void setSensitivityAnalysis( - SensitivityAnalysis sensitivityAnalysis); + public void setSensitivityAnalysis(SensitivityAnalysis sensitivityAnalysis); + + /** + * Get only keep first result policy. + * + * @return only keep first result policy + * @since 4.1.1.0 + */ + public boolean isSensitivityAnalysisOnlyKeepFirst(); /** + * Change only keep first result policy. + * + * @param onlyKeepFirst only keep first result policy + * @since 4.1.1.0 + */ + public void setSensitivityAnalysisOnlyKeepFirst(boolean onlyKeepFirst); + + /** * Return loaded sensitivity export. * * If exports are null or empty, try to load it from last ready parameters. * * @return the sensitivityExportNames */ - public abstract List<SensitivityExport> getSensitivityExport(); + public List<SensitivityExport> getSensitivityExport(); /** * @param sensitivityExport the sensitivityExportNames to set */ - public abstract void setSensitivityExport( + public void setSensitivityExport( List<SensitivityExport> sensitivityExport); /** @@ -333,42 +348,42 @@ * * @return use simulation plan. */ - public abstract boolean getUseSimulationPlan(); + public boolean getUseSimulationPlan(); /** * Set use simulation plans property. * * @param useSimulationPlan use simulation plan to set */ - public abstract void setUseSimulationPlan(boolean useSimulationPlan); + public void setUseSimulationPlan(boolean useSimulationPlan); /** * Get simulation number in simulation plan. * * @return simulation number in simulation plan */ - public abstract int getSimulationPlanNumber(); + public int getSimulationPlanNumber(); /** * Set simulation number in simulation plan. * * @param simulationPlanNumber simulation plan number to set */ - public abstract void setSimulationPlanNumber(int simulationPlanNumber); + public void setSimulationPlanNumber(int simulationPlanNumber); /** * Get number of year to run to simulate. * * @return number of year */ - public abstract int getNumberOfYear(); + public int getNumberOfYear(); /** * Set number of year to run to simulate. * * @param numberOfYear number of year to set */ - public abstract void setNumberOfYear(int numberOfYear); + public void setNumberOfYear(int numberOfYear); /** * Get use prescript. @@ -377,70 +392,70 @@ * * @return Returns the usePreScript. */ - public abstract boolean getUsePreScript(); + public boolean getUsePreScript(); /** * Set use prescript property * * @param usePreScript use preScript to set */ - public abstract void setUsePreScript(boolean usePreScript); + public void setUsePreScript(boolean usePreScript); /** * Get prescript content. * * @return preScript content */ - public abstract String getPreScript(); + public String getPreScript(); /** * Set pre script content. * * @param preScript prescript content */ - public abstract void setPreScript(String preScript); + public void setPreScript(String preScript); /** * Get region name. * * @return region name */ - public abstract String getRegionName(); + public String getRegionName(); /** * Set region name. * * @param regionName region name to set */ - public abstract void setRegionName(String regionName); + public void setRegionName(String regionName); /** * Set simulator name. * * @return simulator name. */ - public abstract String getSimulatorName(); + public String getSimulatorName(); /** * Set simulator name. * * @param simulatorName simulator name to set */ - public abstract void setSimulatorName(String simulatorName); + public void setSimulatorName(String simulatorName); /** * Get enabled result names list. * * @return enabled result names list */ - public abstract Collection<String> getResultEnabled(); + public Collection<String> getResultEnabled(); /** * Set enabled result names list. * * @param resultEnabled enabled result names list */ - public abstract void setResultEnabled(Collection<String> resultEnabled); + public void setResultEnabled(Collection<String> resultEnabled); /** * Get tag values. @@ -449,14 +464,14 @@ * * @return Returns the tagValue. */ - public abstract Map<String, String> getTagValue(); + public Map<String, String> getTagValue(); /** * Set tag values. * * @param tagValue tagValues to set. */ - public abstract void setTagValue(Map<String, String> tagValue); + public void setTagValue(Map<String, String> tagValue); /** * Get simulator log level. @@ -465,14 +480,14 @@ * * @return simualtor log level */ - public abstract String getSimulLogLevel(); + public String getSimulLogLevel(); /** * Set simulator log level. * * @param logLevel simulator log level */ - public abstract void setSimulLogLevel(String logLevel); + public void setSimulLogLevel(String logLevel); /** * Get script log level. @@ -481,14 +496,14 @@ * * @return script log level */ - public abstract String getScriptLogLevel(); + public String getScriptLogLevel(); /** * Set script log level. * * @param logLevel script log level */ - public abstract void setScriptLogLevel(String logLevel); + public void setScriptLogLevel(String logLevel); /** * Get librairies log level. @@ -497,38 +512,38 @@ * * @return librairies log level */ - public abstract String getLibLogLevel(); + public String getLibLogLevel(); /** * Set lib log level. * * @param logLevel */ - public abstract void setLibLogLevel(String logLevel); + public void setLibLogLevel(String logLevel); - public abstract boolean isSimulErrorLevel(); + public boolean isSimulErrorLevel(); - public abstract boolean isSimulWarnLevel(); + public boolean isSimulWarnLevel(); - public abstract boolean isSimulInfoLevel(); + public boolean isSimulInfoLevel(); - public abstract boolean isSimulDebugLevel(); + public boolean isSimulDebugLevel(); - public abstract boolean isScriptErrorLevel(); + public boolean isScriptErrorLevel(); - public abstract boolean isScriptWarnLevel(); + public boolean isScriptWarnLevel(); - public abstract boolean isScriptInfoLevel(); + public boolean isScriptInfoLevel(); - public abstract boolean isScriptDebugLevel(); + public boolean isScriptDebugLevel(); - public abstract boolean isLibErrorLevel(); + public boolean isLibErrorLevel(); - public abstract boolean isLibWarnLevel(); + public boolean isLibWarnLevel(); - public abstract boolean isLibInfoLevel(); + public boolean isLibInfoLevel(); - public abstract boolean isLibDebugLevel(); + public boolean isLibDebugLevel(); /** * Permet d'ajouter des parametres directement à partir de leur @@ -551,7 +566,7 @@ * * @return a copy of this instance */ - public abstract SimulationParameter copy(); + public SimulationParameter copy(); /** * Make a deep copy of current parameters. @@ -561,14 +576,14 @@ * * @return new parameters instance */ - public abstract SimulationParameter deepCopy(); + public SimulationParameter deepCopy(); /** * The toString() method call getters. * * So make instances of rules/export/plans... */ - public abstract String toString(); + public String toString(); /** * Permet de convertir l'objet SimulationParameter en un objet Properties @@ -586,14 +601,14 @@ * @return L'objet Properties representant les parametres * @see #fromProperties(Properties) */ - public abstract Properties toProperties(); + public Properties toProperties(); /** * Load properties from file. * * @param props property to read */ - public abstract void fromProperties(Properties props); + public void fromProperties(Properties props); /** * Reload parameters du to context change. @@ -604,6 +619,6 @@ * * @throws TopiaException */ - public abstract void reloadContextParameters() throws TopiaException; + public void reloadContextParameters() throws TopiaException; -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterCache.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric + * Copyright (C) 2010 - 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -533,9 +533,21 @@ SimulationParameter param = getParam(); param.setSimulationPlanNumber(simulationPlanNumber); store(param); - } + @Override + public boolean isSensitivityAnalysisOnlyKeepFirst() { + SimulationParameter param = getParam(); + return param.isSensitivityAnalysisOnlyKeepFirst(); + } + + @Override + public void setSensitivityAnalysisOnlyKeepFirst(boolean onlyKeepFirst) { + SimulationParameter param = getParam(); + param.setSensitivityAnalysisOnlyKeepFirst(onlyKeepFirst); + store(param); + } + /* * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfYear() */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationParameterImpl.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -141,7 +141,7 @@ /** Utilisation du plan de simulation. */ protected Boolean useSimulationPlan; - /** + /** * Le numero de sequence de la liste des plans de simulation. Le premier * élement du plan doit etre 0. Si la simulation ne fait pas partie d'un * plan la valeur est -1. */ @@ -160,6 +160,14 @@ */ protected Integer numberOfSensitivitySimulation; + /** + * Dans une analyze de sensibilite, conserver les résultats de toutes + * les simulations est inutile, seule les résultats de la premières + * sont nécéssaires. Les resultats peuvent être supprimés après les + * export de données. + */ + protected Boolean sensitivityAnalysisOnlyKeepFirst; + /** Script utilisé pour les analyses de sensibilités. */ protected SensitivityAnalysis sensitivityAnalysis; @@ -866,7 +874,7 @@ useSimulationPlan = Boolean.FALSE; } } - return this.useSimulationPlan; + return useSimulationPlan; } /* @@ -892,7 +900,7 @@ } } - return this.simulationPlanNumber.intValue(); + return simulationPlanNumber.intValue(); } /* @@ -903,6 +911,25 @@ this.simulationPlanNumber = simulationPlanNumber; } + @Override + public boolean isSensitivityAnalysisOnlyKeepFirst() { + if (sensitivityAnalysisOnlyKeepFirst == null) { + + if (propertiesParameters != null) { + sensitivityAnalysisOnlyKeepFirst = Boolean.valueOf(propertiesParameters.getProperty("sensitivityAnalysisOnlyKeepFirst", "-1")); + } else { + sensitivityAnalysisOnlyKeepFirst = Boolean.FALSE; + } + } + + return sensitivityAnalysisOnlyKeepFirst.booleanValue(); + } + + @Override + public void setSensitivityAnalysisOnlyKeepFirst(boolean onlyKeepFirst) { + sensitivityAnalysisOnlyKeepFirst = onlyKeepFirst; + } + /* * @see fr.ifremer.isisfish.simulator.SimulationParameter#getNumberOfYear() */ @@ -1620,6 +1647,9 @@ } } + // sensitivity params + result.setProperty("sensitivityAnalysisOnlyKeepFirst", String.valueOf(isSensitivityAnalysisOnlyKeepFirst())); + result.setProperty("usePreScript", String.valueOf(getUsePreScript())); result.setProperty("preScript", getPreScript()); result.setProperty("useSimulationPlan", String.valueOf(getUseSimulationPlan())); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlan.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlan.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlan.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanContext.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanIndependent.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanIndependent.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPlanIndependent.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationPreScript.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationProperties.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultGetter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultListener.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationResultXML.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulationVariable.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -36,7 +36,6 @@ import fr.ifremer.isisfish.entities.EquationImpl; import fr.ifremer.isisfish.entities.Variable; import fr.ifremer.isisfish.equation.VariableEquation; -import fr.ifremer.isisfish.types.TimeStep; import fr.ifremer.isisfish.util.EvaluatorHelper; /** @@ -76,7 +75,7 @@ Variable v = variablesCache.get(name); if (v == null) { TopiaContext topiaContext = simulationContext.getDB(); - List<Variable> vindb = topiaContext.find("FROM " + Variable.class.getName() + + List<Variable> vindb = topiaContext.findAll("FROM " + Variable.class.getName() + " WHERE " + Variable.PROPERTY_ENTITY_ID + " = :id" + " AND " + Variable.PROPERTY_NAME + " = :name", "id", topiaEntity.getTopiaId(), Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/Simulator.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/SimulatorServerBadIdException.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2002 - 2010 Ifremer, Code Lutin, Benjamin Poussin + * Copyright (C) 2002 - 2012 Ifremer, Code Lutin, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -53,9 +53,10 @@ import fr.ifremer.isisfish.IsisFish; import fr.ifremer.isisfish.IsisFishRuntimeException; import fr.ifremer.isisfish.aspect.AspectClassLoader; -import fr.ifremer.isisfish.aspect.Cache; +import fr.ifremer.isisfish.aspect.CacheAspect; import fr.ifremer.isisfish.aspect.RuleAspect; -import fr.ifremer.isisfish.aspect.Trace; +import fr.ifremer.isisfish.aspect.TraceAspect; +import fr.ifremer.isisfish.datastore.ResultStorage; import fr.ifremer.isisfish.datastore.SimulationStorage; import fr.ifremer.isisfish.datastore.SimulatorStorage; import fr.ifremer.isisfish.simulator.SimulationContext; @@ -66,8 +67,8 @@ import fr.ifremer.isisfish.simulator.SimulationParameter; import fr.ifremer.isisfish.simulator.SimulationPreScript; import fr.ifremer.isisfish.simulator.Simulator; +import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.TimeStep; -import fr.ifremer.isisfish.types.Month; /** * Fait une simulation dans la meme jvm. @@ -171,7 +172,7 @@ * @see fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher#maxSimulationThread() */ public int maxSimulationThread() { - return 1; + return IsisFish.config.getSimulatorInMaxThreads(); } /* @@ -181,7 +182,6 @@ public int getCheckProgressionInterval() { // par defaut, pour les in process 5 secondes - int interval = 1; return interval; } @@ -353,20 +353,14 @@ // Activation de l'OAP demandée // if (parameters.getUseStatistic() || parameters.getUseOptimization()) { - - // il est necessaire de passer un object trace/cache - // commun, donc on le met dans le context - // pas moyen de le passer autrement plus simplement - fr.ifremer.isisfish.util.Trace traceObject = new fr.ifremer.isisfish.util.Trace(""); - context.setValue(fr.ifremer.isisfish.util.Trace.class.getName(), traceObject); - + if (parameters.getUseStatistic()) { message(control, _("isisfish.message.setting.trace.aspects")); - classLoader.deploy(Trace.class); + classLoader.deploy(TraceAspect.class); } if (parameters.getUseOptimization()) { message(control, _("isisfish.message.setting.cache.aspects")); - classLoader.deploy(Cache.class); + classLoader.deploy(CacheAspect.class); } } @@ -425,6 +419,14 @@ // quand date =progressMax control.setProgress(control.getProgress() + 1); + // suppression des résultats si l'utilisateur a demande à ne conserver + // que les resultats de seulement la première simulation d'une AS + ResultStorage resultStorage = simulation.getResultStorage(); + if (parameters.isSensitivityAnalysisOnlyKeepFirst() && !control.getId().endsWith("_0")) { + resultStorage.delete(); + } + resultStorage.close(); + } catch (OutOfMemoryError eee) { log.error(_("isisfish.error.during.simulation"), eee); simulation.getInformation().setException(eee); @@ -438,14 +440,13 @@ // // Finaly close all TopiaContext used during simulation // - SimulationContext context = SimulationContext.get(); context.closeDB(); context.closeDBResult(); try { - // close all transaction + // close all transaction (root context) if (context.getSimulationStorage() != null) { context.getSimulationStorage().closeMemStorage(); context.getSimulationStorage().closeStorage(); @@ -465,11 +466,11 @@ (end - start) / 1000000, "s'.'S")); SimulationParameter param = simulation.getParameter(); if (param.getUseStatistic()) { - String trace = Trace.printStatistiqueAndClear(); + String trace = context.getTrace().printStatisticAndClear(); simulation.getInformation().setStatistic(trace); } if (param.getUseOptimization()) { - String cache = Cache.printStatistiqueAndClear(); + String cache = context.getCache().printStatistiqueAndClear(); simulation.getInformation().setOptimizationUsage(cache); } @@ -479,8 +480,8 @@ log.debug("Delete simulation build directory : " + simulationBuildDirectory.getAbsolutePath()); } FileUtil.deleteRecursively(simulationBuildDirectory); - - // context is used in Trace.printStatistiqueAndClear() + + // context is used in TraceAspect.printStatistiqueAndClear() SimulationContext.remove(); } return result; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/JDKPriorityBlockingQueue.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SSHSimulatorLauncher.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -176,7 +176,7 @@ @Override public int maxSimulationThread() { - // met le serveur les lance quand il veut + // mais le serveur les lance quand il veut int maxSimulationThread = IsisFish.config.getSimulatorSshMaxThreads(); if (maxSimulationThread <= 0) { @@ -414,14 +414,7 @@ if (resultArchiveFile != null) { - // FIXME big hacks here, only extract non first simulation - // only for AS - if (control.getId().startsWith("as_") && !control.getId().endsWith("_0")) { - ZipUtil.uncompressFiltred(resultArchiveFile, SimulationStorage.getSimulationDirectory(), ".*/data/.*"); - } - else { - ZipUtil.uncompressFiltred(resultArchiveFile, SimulationStorage.getSimulationDirectory()); - } + ZipUtil.uncompressFiltred(resultArchiveFile, SimulationStorage.getSimulationDirectory()); if (log.isDebugEnabled()) { log.debug("Simulation imported : " + resultArchiveFile.getAbsolutePath()); @@ -1111,6 +1104,7 @@ root.put("isishome", IsisFish.config.getSimulatorSshIsisHome()); root.put("isistemp", getRemoteTempDirectory()); root.put("javapath", IsisFish.config.getSimulatorSshJavaPath()); + root.put("javamemory", IsisFish.config.getSimulatorSshMaxMemory()); root.put("simulationid", simuationId); root.put("simulationzip", simulationZip); root.put("simulationstandalonezip", standaloneZip); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationExecutor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationItem.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationJob.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationQueue.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -220,7 +220,9 @@ } /** - * @return les SimulatorLauncher et leurs noms + * Retour les lanceurs ayant un executor. + * + * @return les SimulatorLauncher */ public List<SimulatorLauncher> getSimulationLaunchers() { List<SimulatorLauncher> result = new ArrayList<SimulatorLauncher>( @@ -1014,6 +1016,8 @@ } // close context for plan generator + // FIXME echatellier 20120904 could throw + //org.nuiton.topia.TopiaException: Ce contexte a deja ete ferme sim.closeStorage(); // quoi qu'il arrive on supprime le repertoire temporaire Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceListener.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTableModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulatorLauncher.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -110,8 +110,15 @@ @Override public int maxSimulationThread() { - // TODO rendre configurable le nombre de processeurs a utiliser - int result = Runtime.getRuntime().availableProcessors(); + + int result = IsisFish.config.getSimulatorSubMaxProcess(); + + // s'il n'y a pas de configuration utilisateur particulière + // on utilise le nombre de processeur physique + if (result <= 0) { + result = Runtime.getRuntime().availableProcessors(); + } + return result; } @@ -189,16 +196,20 @@ // common args List<String> command = new ArrayList<String>(); command.add(java); - command.add("-Xmx1024M"); + command.add("-Xmx" + IsisFish.config.getSimulatorSubMaxMemory()); // jri args String libraryPath = System.getProperty("java.library.path"); if (StringUtils.isNotBlank(libraryPath)) { - command.add("-Djava.library.path=\"" + libraryPath + "\""); + // il semble y avoir un problème de path sous windows, + // il faut mettre le chemin complet sinon les lib + // ne sont pas trouvées + libraryPath = System.getProperty("user.dir") + File.separator + libraryPath; + command.add("-Djava.library.path=" + libraryPath + ""); } String rType = System.getProperty("R.type"); if (StringUtils.isNotBlank(rType)) { - command.add("-DR.type=\"" + rType + "\""); + command.add("-DR.type=" + rType + ""); } // common args @@ -208,9 +219,7 @@ command.add("--option"); command.add("launch.ui"); command.add("false"); - - // prepare le process - ProcessBuilder processBuilder = null; + if (tempPrescriptFile != null) { command.add("--simulateWithSimulationAndScript"); command.add(simulationId); @@ -223,7 +232,8 @@ command.add(simulationZip.getAbsolutePath()); } - processBuilder = new ProcessBuilder(command); + // prepare le process + ProcessBuilder processBuilder = new ProcessBuilder(command); processBuilder.redirectErrorStream(true); // demarrage du process Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/launcher/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/AbstractSensitivityAnalysis.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/DesignPlan.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Domain.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/FactorGroup.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Scenario.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysis.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysis.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysis.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityCalculator.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityException.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityScenarios.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtils.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/ContinuousDomain.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationDiscreteDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationDiscreteDomain.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/EquationDiscreteDomain.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/RuleDiscreteDomain.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DesignPlanVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/DomainVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorGroupVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorGroupVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorGroupVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/FactorVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/ScenarioVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/SensitivityScenariosVisitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/visitor/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/Month.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/Month.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/Month.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/RangeOfValues.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeStep.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeStep.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeStep.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/TimeUnit.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MatrixType.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -41,7 +41,6 @@ import org.nuiton.math.matrix.MatrixND; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; -import org.hibernate.Hibernate; import org.hibernate.HibernateException; import org.hibernate.engine.SessionImplementor; import org.hibernate.engine.jdbc.NonContextualLobCreator; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/MonthType.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/RangeOfValuesType.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeStepType.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/types/hibernate/TimeUnitType.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/CommonHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/CommonHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/CommonHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,7 +1,5 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% @@ -9,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/NavigationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/NavigationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/NavigationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,9 +19,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel layout='{new BorderLayout()}'> -</JPanel> \ No newline at end of file +</JPanel> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SaveVerifier.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/SimulationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2010 - 2011 CodeLutin, Chatellier Eric + Copyright (C) 2010 - 2011 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel layout='{new BorderLayout()}' abstract="true"> @@ -112,4 +112,4 @@ </JMenu> </JMenuBar> <JTabbedPane id="bodyTabbedPane" constraints='BorderLayout.CENTER'/> -</JPanel> \ No newline at end of file +</JPanel> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/StatusBarUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table> @@ -62,4 +62,4 @@ <jaxx.runtime.swing.StatusMessagePanel /> </cell> </row> -</Table> \ No newline at end of file +</Table> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,7 +1,5 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% @@ -9,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -222,6 +220,13 @@ modelBuilder.addOption(IsisConfig.Option.SIMULATION_SHOW_ONLY_ERROR); modelBuilder.addOption(IsisConfig.Option.SIMULATION_SCRIPT_AUTOCONFIG); + // category simulation + modelBuilder.addCategory(_("isisfish.config.category.simulation"), _("isisfish.config.category.simulation.description")); + modelBuilder.addOption(IsisConfig.Option.SIMULATOR_IN_MAXTHREADS); + modelBuilder.addOption(IsisConfig.Option.SIMULATOR_SUB_MAXPROCESS); + modelBuilder.addOption(IsisConfig.Option.SIMULATOR_SUB_MAXMEMORY); + modelBuilder.addOption(IsisConfig.Option.MAPPED_RESULT_MATRIX_VECTOR_CLASS); + // category database vcs modelBuilder.addCategory(_("isisfish.config.category.officialvcs"), _("isisfish.config.category.officialvcs.description")); modelBuilder.addOption(IsisConfig.Option.VCS_TYPE); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomePanelUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel layout='{new BorderLayout()}'> @@ -64,4 +64,4 @@ ]]> </script> <StatusBarUI id='statusBar' constraints="BorderLayout.SOUTH" /> -</JPanel> \ No newline at end of file +</JPanel> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeSaveVerifier.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel layout='{new BorderLayout()}'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JFrame width='874' height='736' resizable="true" layout='{new BorderLayout()}'> @@ -65,4 +65,4 @@ </JMenu> </JMenuBar> <WelcomePanelUI id="welcomePanelUI" constructorParams='this'/> -</JFrame> \ No newline at end of file +</JFrame> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,7 +1,5 @@ /* * #%L - * - * * $Id$ * $HeadURL$ * %% @@ -9,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/RConfigUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog title="isisfish.simulator.configuration.r.title" layout="{new BorderLayout()}"> @@ -65,4 +65,4 @@ </cell> </row> </Table> -</JDialog> \ No newline at end of file +</JDialog> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + * Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -79,6 +79,7 @@ protected String currentSSHPbsBinPath; protected String currentSSHPbsQsubOptions; protected String currentSSHMaxThreads; + protected String currentSSHMaxMemory; protected String currentSSHControlInterval; /** @@ -109,6 +110,7 @@ configUI.getSshPbsQsubOptionsField().setText(IsisFish.config.getSimulatorSshPbsQsubOptions()); configUI.getSshControlIntervalField().setText(String.valueOf(IsisFish.config.getSimulatorSshControlCheckInterval())); configUI.getSshMaxThreadsField().setText(String.valueOf(IsisFish.config.getSimulatorSshMaxThreads())); + configUI.getSshMaxMemoryField().setText(IsisFish.config.getSimulatorSshMaxMemory()); doCheck(); } @@ -207,6 +209,9 @@ } else { setColor(false, configUI.getSshMaxThreadsField()); } + + // currentSSHMaxMemory + currentSSHMaxMemory = configUI.getSshMaxMemoryField().getText().trim(); // currentSSHControlInterval currentSSHControlInterval = configUI.getSshControlIntervalField() @@ -236,6 +241,7 @@ IsisFish.config.setSimulatorSshPbsQsubOptions(currentSSHPbsQsubOptions); IsisFish.config.setSimulatorSshControlCheckInterval(Integer.parseInt(currentSSHControlInterval)); IsisFish.config.setSimulatorSshMaxThreads(Integer.parseInt(currentSSHMaxThreads)); + IsisFish.config.setSimulatorSshMaxMemory(currentSSHMaxMemory); IsisFish.config.saveForUser(); configUI.dispose(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/config/SSHLauncherConfigUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2012 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog resizable="false" title="isisfish.simulator.ssh.configuration.title" @@ -157,6 +157,17 @@ </row> <row fill='horizontal'> <cell> + <JLabel id='sshMaxMemoryLabel' text='isisfish.config.main.simulation.ssh.max.memory' + toolTipText='isisfish.config.main.simulation.ssh.max.memory.description' /> + </cell> + <cell> + <JTextField id='sshMaxMemoryField' + toolTipText='isisfish.config.main.simulation.ssh.max.memory.description' + onKeyReleased="getAction().doCheck()" /> + </cell> + </row> + <row fill='horizontal'> + <cell> <JLabel id='sshControlIntervalLabel' text='isisfish.config.main.simulation.ssh.control.check.interval' toolTipText='isisfish.config.main.simulation.ssh.control.check.interval.description' /> </cell> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/CellUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Cell'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ChangeModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionParametersUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='SetOfVessels'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EffortDescriptionUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='SetOfVessels'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/EquationEditorPaneUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog id="EquationEditorPane" modal="true" title="isisfish.equation.editor.title" Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/FisheryRegionUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='FisheryRegion'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearTabUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Gear'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/GearUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Gear'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputContentUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel layout='{new BorderLayout()}' genericType='B extends TopiaEntityContextable' abstract="true"> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='org.nuiton.topia.persistence.TopiaEntityContextable'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputSaveVerifier.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputTabbedPaneListener.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/InputUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.NavigationUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Metier'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoZoneUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Metier'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierTabUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Metier'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/MetierUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Metier'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/OpenMapEvents.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> @@ -145,7 +145,7 @@ <cell anchor='east'> <JLabel text="isisfish.populationBasics.name" enabled='{isActive()}'/> </cell> - <cell columns='2' fill='horizontal' weightx='1.0'> + <cell columns='3' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationBasicsName" text='{getBean().getName()}' onKeyReleased='getBean().setName(fieldPopulationBasicsName.getText())' enabled='{isActive()}' decorator='boxed'/> @@ -155,7 +155,7 @@ <cell anchor='east'> <JLabel text="isisfish.populationBasics.geographicID" enabled='{isActive()}'/> </cell> - <cell columns='2' fill='horizontal' weightx='1.0'> + <cell columns='3' fill='horizontal' weightx='1.0'> <JTextField id="fieldPopulationBasicsGeographicID" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getGeographicId())}' onKeyReleased='getBean().setGeographicId(fieldPopulationBasicsGeographicID.getText())' @@ -175,9 +175,7 @@ <JButton id="buttonPopulationBasicsCreateClasses" text="isisfish.populationBasics.recreateClasses" onActionPerformed='createGroups()' enabled='{isActive()}' decorator='boxed'/> </cell> - </row> - <row> - <cell fill='horizontal' columns="3"> + <cell fill='horizontal'> <JCheckBox id="fieldPopulationBasicsPlusGroup" text="isisfish.populationBasics.plusGroup" toolTipText="isisfish.populationBasics.plusGroupTip" selected='{getBean().getPlusGroup()}' @@ -186,12 +184,36 @@ </cell> </row> <row> - <cell columns='3' fill='both' weightx='1.0'> + <cell anchor='east' insets="0"> + <JLabel text="isisfish.populationBasics.groupMin" enabled='{isActive()}'/> + </cell> + <cell fill='horizontal' columns='3' insets="0"> + <Table> + <row> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupMin" text='{String.valueOf(getBean().getGroupMin())}' + onKeyReleased='getBean().setGroupMin(Integer.parseInt(fieldPopulationGroupMin.getText()))' + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"MinAge"'/> + </cell> + <cell> + <JLabel text="isisfish.populationBasics.groupMax" enabled='{isActive()}'/> + </cell> + <cell fill='horizontal' weightx='1.0'> + <JTextField id="fieldPopulationGroupMax" text='{String.valueOf(getBean().getGroupMax())}' + onKeyReleased='getBean().setGroupMax(Integer.parseInt(fieldPopulationGroupMax.getText()))' + enabled='{isActive()}' decorator='boxed' _sensitivityBean='{Population.class}' _sensitivityMethod='"MaxAge"'/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell columns='4' fill='both' weightx='1.0'> <JTable id='tableAgeLength' rowHeight='24' enabled='false' decorator='boxed'/> </cell> </row> <row> - <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> + <cell columns='4' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='growthEquation' constructorParams='this' text='isisfish.populationBasics.growth' active='{isActive()}' bean='{getBean()}' beanProperty='growth' formuleCategory='Growth' @@ -200,7 +222,7 @@ </cell> </row> <row> - <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> + <cell columns='4' fill='both' weightx='1.0' weighty='1.0'> <InputOneEquationUI id='growthReverseEquation' constructorParams='this' text='isisfish.populationBasics.growthReverse' active='{isActive()}' bean='{getBean()}' formuleCategory='GrowthReverse' beanProperty='GrowthReverse' @@ -212,7 +234,7 @@ <cell anchor='east'> <JLabel text="isisfish.population.comments" enabled='{isActive()}'/> </cell> - <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> + <cell columns='3' fill='both' weightx='1.0' weighty='1.0'> <JScrollPane> <JTextArea id="fieldPopulationBasicsComment" text='{jaxx.runtime.SwingUtil.getStringValue(getBean().getComment())}' Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationEquationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!-- Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEquationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> @@ -207,4 +207,4 @@ </row> </Table> </JPanel> - </fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file + </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationPriceUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationPriceUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationPriceUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, Code Lutin, Chatellier Eric + Copyright (C) 2009 - 2012 Ifremer, Code Lutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Population'> @@ -41,12 +41,6 @@ installChangeListener(populationTab); } -/*public void refresh() { - // reverse ordre is no more needed - getSaveVerifier().addCurrentPanel(populationMigrationUI, populationRecruitementUI, populationCapturabilityUI, - populationSeasonsUI, populationZoneUI, populationEquationUI, populationGroupUI, populationBasicsUI); -}*/ - @Override public void setLayer(boolean active) { super.setLayer(active); @@ -59,6 +53,7 @@ populationCapturabilityUI.setLayer(active); populationMigrationUI.setLayer(active); populationPriceUI.setLayer(active); + variablesUI.setLayer(active); } @Override @@ -72,6 +67,7 @@ populationCapturabilityUI.resetChangeModel(); populationMigrationUI.resetChangeModel(); populationPriceUI.resetChangeModel(); + variablesUI.resetChangeModel(); } ]]> </script> @@ -113,6 +109,11 @@ <tab title='isisfish.populationPrice.title'> <PopulationPriceUI id='populationPriceUI' bean="{getBean()}" active="{isActive()}" sensitivity="{isSensitivity()}" constructorParams='this'/> </tab> + <tab title='isisfish.variables.tabtitle'> + <fr.ifremer.isisfish.ui.input.variable.EntityVariableUI id="variablesUI" + bean="{getBean()}" active="{isActive()}" + sensitivity="{isSensitivity()}" constructorParams='this'/> + </tab> </JTabbedPane> </JPanel> </fr.ifremer.isisfish.ui.input.InputContentUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Population'> @@ -197,4 +197,4 @@ </row> </Table> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Population'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/PortUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Port'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/RangeOfValuesUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Gear'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Gear'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsBasicsUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='SetOfVessels'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SetOfVesselsUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.SetOfVessels'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesStructuredUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Species'> @@ -48,4 +48,4 @@ </row> </Table> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/SpeciesUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Species'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Strategy'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Strategy'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyTabUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Strategy'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/StrategyUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Strategy'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/TripTypeUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='TripType'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/VesselTypeUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='VesselType'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/WizardGroupCreationUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel id="wizardGroup" layout='{new BorderLayout()}'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneBasicsUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='Zone'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='fr.ifremer.isisfish.entities.Zone'> @@ -68,4 +68,4 @@ </tab> </JTabbedPane> </JPanel> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckRegion.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResult.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultFrame.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/check/CheckResultTableRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/formule/FormuleComboRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/EffortDescriptionListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/EffortDescriptionListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/EffortDescriptionListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/GearPopulationSelectivityModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/MetierSeasonInfoTargetSpeciesTableModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationSeasonInfoComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationSeasonInfoComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PopulationSeasonInfoComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PortComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PortComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/PortComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SetOfVesselsComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SetOfVesselsComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SetOfVesselsComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SpeciesComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SpeciesComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/SpeciesComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TopiaEntityListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/TripTypeListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/VesselTypeComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/VesselTypeComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/VesselTypeComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/ZoneListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/ZoneListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/model/ZoneListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/EffortDescriptionListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/EffortDescriptionListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/EffortDescriptionListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierSeasonInfoComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierSeasonInfoComboRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/MetierSeasonInfoComboRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/PopulationSeasonInfoComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/PopulationSeasonInfoComboRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/PopulationSeasonInfoComboRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/renderer/TripTypeListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryDataProvider.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeNode.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeNode.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeNode.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeSelectionModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeSelectionModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/FisheryTreeSelectionModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -1,6 +1,5 @@ /* * #%L - * * $Id$ * $HeadURL$ * %% @@ -8,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -18,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/CellsNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/FisheryTreeNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/GearsNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/MetiersNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PopulationsNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/PortsNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SetOfVesselsNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/SpeciesNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/StrategiesNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/TripTypesNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/VesselTypesNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/tree/loadors/ZonesNodeLoador.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.input.tree.loadors; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -30,6 +30,7 @@ import javax.swing.JList; +import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -79,6 +80,18 @@ } catch (TopiaException ex) { throw new IsisFishRuntimeException("Can't init view", ex); } + + // try to set entity name in label + try { + String name = BeanUtils.getProperty(view.getBean(), "name"); + view.getVariableEntityName().setText(name); + } catch (Exception ex) { + if (log.isWarnEnabled()) { + log.warn("Can't get entity name", ex); + } + } + } else { + view.getVariableEntityName().setText(""); } model.setEntities(variables); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/EntityVariableUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.input.InputContentUI superGenericType='org.nuiton.topia.persistence.TopiaEntityContextable'> @@ -76,6 +76,16 @@ <Table border='{BorderFactory.createTitledBorder(_("isisfish.variables.variabledetail"))}'> <row> <cell fill="horizontal"> + <JLabel text="isisfish.variables.entityname" + enabled='{isActive() && getVariable() != null}'/> + </cell> + <cell fill="horizontal" weightx='1.0'> + <JLabel id="variableEntityName" + enabled='{isActive() && getVariable() != null}'/> + </cell> + </row> + <row> + <cell fill="horizontal"> <JLabel text="isisfish.variables.variablename" enabled='{isActive() && getVariable() != null}'/> </cell> @@ -192,4 +202,4 @@ </cell> </row> </Table> -</fr.ifremer.isisfish.ui.input.InputContentUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.input.InputContentUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/input/variable/VariableTypeComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogConsoleUI.jaxx =================================================================== (Binary files differ) Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/logging/console/LogMailUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog> @@ -78,4 +78,4 @@ </cell> </row> </Table> -</JDialog> \ No newline at end of file +</JDialog> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellEditor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellEditor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellEditor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableCellRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/ScriptParametersTableModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/common/StringListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/export/ExportNameListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/result/ResultListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListCellRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleNamesListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellEditor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/rule/RuleParametersFactorTableCellRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisComboRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityanalysis/SensitivityAnalysisListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/sensitivityexport/SensitivityExportNameListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanComboRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/models/simulationplan/SimulationPlanListRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/ComponentTableCellRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/queue/QueueUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table> @@ -83,4 +83,4 @@ <JButton id="clearDoneJobsButton" text="isisfish.queue.clearDone" onActionPerformed='queueAction.clearDoneJobs()' enabled='{isCanClear()}' /> </cell> </row> -</Table> \ No newline at end of file +</Table> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendGraphic.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendGraphic.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendGraphic.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/LegendPanel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MapRendererUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table> @@ -49,4 +49,4 @@ <LegendPanel id="legendPanel" /> </cell> </row> -</Table> \ No newline at end of file +</Table> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixMapRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/MatrixSummaryRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultMatrixFilter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultSimulationFrame.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JInternalFrame resizable="true" iconifiable="true" maximizable="true" closable="true"> @@ -55,4 +55,4 @@ </cell> </row> </Table> -</JInternalFrame> \ No newline at end of file +</JInternalFrame> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/ResultUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel layout='{new BorderLayout()}'> @@ -57,4 +57,4 @@ <JDesktopPane id="simulationDesktopPane" constraints="BorderLayout.CENTER" /> -</JPanel> \ No newline at end of file +</JPanel> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/SumByYearMatrixFilter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/YearSumDimensionAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/YearSumDimensionAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/result/YearSumDimensionAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ExportDialogUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog modal="true" resizable='false' title='isisfish.script.export'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/FileSelectionTableModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.css 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ #newFilesLabel { Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ImportDialogUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog modal="true" resizable='false' title='isisfish.script.import'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -292,7 +292,7 @@ Language.JAVA); break; case CommunitySimulationPlan: - script = SimulationPlanStorage.getSimulationPlan(fileName, Location.COMMUNITY); + script = SimulationPlanStorage.createSimulationPlan(fileName, Location.COMMUNITY); break; case CommunityExport: script = ExportStorage.createExport(fileName, Location.COMMUNITY); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptFileFilter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptFileFilter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptFileFilter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptTypesComboModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/ScriptUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel layout='{new BorderLayout()}'> @@ -46,21 +46,21 @@ <JMenu id="scriptTxtFile" text="isisfish.script.menu.file"> <JMenu id="scriptNewMenu" text="isisfish.script.menu.new" icon="script.png"> <JMenuItem id="miNewScript" text="isisfish.script.menu.txtNewScript" - onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Script)' icon="script.png" /> + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.CommunityScript)' icon="script.png" /> <JMenuItem id="miNewSimulator" text="isisfish.script.menu.txtNewSimulator" - onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Simulator)' icon="script.png" /> + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.CommunitySimulator)' icon="script.png" /> <JMenuItem id="miNewExport" text="isisfish.script.menu.txtNewExport" - onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Export)' icon="script.png" /> + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.CommunityExport)' icon="script.png" /> <JMenuItem id="miNewRule" text="isisfish.script.menu.txtNewRule" - onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Rule)' icon="script.png" /> + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.CommunityRule)' icon="script.png" /> <JMenuItem id="miNewSImulationPlan" text="isisfish.script.menu.txtNewSimulationPlan" - onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SimulationPlan)' icon="script.png" /> + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.CommunitySimulationPlan)' icon="script.png" /> <JMenuItem id="miNewSensitivity" text="isisfish.script.menu.txtNewSensitivity" - onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Sensitivity)' icon="script.png" /> + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.CommunitySensitivity)' icon="script.png" /> <JMenuItem id="miNewSensitivityExport" text="isisfish.script.menu.txtNewSensitivityExport" - onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.SensitivityExport)' icon="script.png" /> + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.CommunitySensitivityExport)' icon="script.png" /> <JMenuItem id="miNewEquationModel" text="isisfish.script.menu.txtNewEquationModel" - onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.Formule)' icon="script.png" /> + onActionPerformed='getScriptAction().newScript(ScriptAction.ScriptMapping.CommunityFormule)' icon="script.png" /> </JMenu> <JMenuItem id="miSave" text="isisfish.script.menu.save" onActionPerformed="getScriptAction().saveScript()" icon="script_save.png" enabled='{isSingleFileSelected()}' /> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/BackupAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/CancelAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ChooseFileAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ExportAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -157,4 +157,4 @@ throw new IsisFishRuntimeException("Can't export script", ex); } } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/action/ImportAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -143,4 +143,4 @@ } return toBackup; } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTranferable.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTranferable.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTranferable.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTransferHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTree.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTree.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTree.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeCellRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/ScriptTreeModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/model/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/script/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table> @@ -318,4 +318,4 @@ </JScrollPane> </cell> </row> -</Table> \ No newline at end of file +</Table> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityInputHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -29,33 +29,60 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.MouseEvent; +import java.io.File; +import java.lang.reflect.Method; +import java.util.ArrayList; import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; +import javax.swing.JScrollPane; +import javax.swing.JTextField; import javax.swing.event.TreeSelectionEvent; import javax.swing.text.JTextComponent; import javax.swing.tree.DefaultTreeModel; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; +import jaxx.runtime.context.JAXXInitialContext; + +import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.math.matrix.MatrixND; import org.nuiton.math.matrix.gui.MatrixPanelEditor; import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityContextable; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.entities.Equation; import fr.ifremer.isisfish.entities.FisheryRegion; +import fr.ifremer.isisfish.mexico.MexicoHelper; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.simulator.sensitivity.DesignPlan; +import fr.ifremer.isisfish.simulator.sensitivity.Domain; import fr.ifremer.isisfish.simulator.sensitivity.Factor; import fr.ifremer.isisfish.simulator.sensitivity.FactorGroup; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.EquationDiscreteDomain; +import fr.ifremer.isisfish.simulator.sensitivity.domain.RuleDiscreteDomain; import fr.ifremer.isisfish.types.Month; +import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeStep; +import fr.ifremer.isisfish.types.TimeUnit; +import fr.ifremer.isisfish.ui.SimulationUI; +import fr.ifremer.isisfish.ui.input.InputAction; import fr.ifremer.isisfish.ui.input.InputContentUI; import fr.ifremer.isisfish.ui.input.InputHandler; import fr.ifremer.isisfish.ui.input.InputOneEquationUI; @@ -63,9 +90,13 @@ import fr.ifremer.isisfish.ui.input.tree.FisheryTreeHelper; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeNode; import fr.ifremer.isisfish.ui.input.tree.FisheryTreeRenderer; +import fr.ifremer.isisfish.ui.sensitivity.wizard.EquationContinuousPanelUI; import fr.ifremer.isisfish.ui.sensitivity.wizard.FactorWizardUI; import fr.ifremer.isisfish.ui.sensitivity.wizard.SensitivityWizardHandler; import fr.ifremer.isisfish.ui.simulator.RuleChooser; +import fr.ifremer.isisfish.ui.simulator.SimulAction; +import fr.ifremer.isisfish.ui.widget.editor.MonthComponent; +import fr.ifremer.isisfish.ui.widget.editor.StepComponent; /** * Handler for sensitivity tab ui (fishery region factors). @@ -355,4 +386,33 @@ return result; } + + /** + * Export factors list to xml mexico file. + * + * @since 4.1.1.2 + */ + public void exportFactorsToMexico(SensitivityTabUI view) { + File xmlFile = FileUtil.getFile(_("isisfish.sensitivity.mexico.exporttoxml.title"), + _("isisfish.sensitivity.mexico.exporttoxml.approve"), view, + new String[]{ + ".*\\.xml", + _("isisfish.sensitivity.mexico.exporttoxml.filter") + }); + + if (xmlFile != null) { + + // try to add ".xml" extension if no present + if (!FilenameUtils.isExtension(xmlFile.getAbsolutePath(), "xml")) { + xmlFile = new File(xmlFile.getAbsolutePath() + ".xml"); + } + + SimulAction simulAction = view.getContextValue(SimulAction.class); + + DesignPlan designPlan = new DesignPlan(); + designPlan.setFactorGroup(simulAction.getFactorGroup()); + String xml = MexicoHelper.getDesignPlanAsXML(designPlan); + MexicoHelper.writeDesignPlanToFile(xmlFile, designPlan); + } + } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySaveVerifier.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivitySecondPassUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table> @@ -146,4 +146,4 @@ </JScrollPane> </cell> </row> -</Table> \ No newline at end of file +</Table> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2011 Ifremer, CodeLutin, Chatellier Eric + Copyright (C) 2009 - 2012 Ifremer, CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.NavigationUI> @@ -108,13 +108,17 @@ <JButton icon="factors/dgroup.png" toolTipText="isisfish.sensitivity.newfactordgroup.tip" onActionPerformed="getHandler().addNewFactorGroup(this, false)"/> </cell> - <cell anchor='west' weightx='1'> + <cell anchor='west'> <JButton icon="factors/cgroup.png" toolTipText="isisfish.sensitivity.newfactorcgroup.tip" onActionPerformed="getHandler().addNewFactorGroup(this, true)"/> </cell> + <cell anchor='west' weightx='1'> + <JButton icon="script_go.png" toolTipText="isisfish.sensitivity.mexico.exporttoxml.tip" + onActionPerformed="getHandler().exportFactorsToMexico(this)"/> + </cell> </row> <row> - <cell columns='2' fill="both" weightx='1.0' weighty='1.0'> + <cell columns='3' fill="both" weightx='1.0' weighty='1.0'> <JScrollPane> <FactorTree id="factorsTree" constructorParams='this' rootVisible="true" selectionRow='0' @@ -136,4 +140,4 @@ <JPanel id="inputPane" layout='{getCardlayout()}' constraints='"normale"'/> </JPanel> </JSplitPane> -</fr.ifremer.isisfish.ui.NavigationUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.NavigationUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTableModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTableModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -56,4 +56,4 @@ * @return property name at column (can be {@code null}) */ String getPropertyAtColumn(int column); -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.SimulationUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/TableBlockingLayerUI.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -154,4 +154,4 @@ protected void processMouseMotionEvent(MouseEvent e, JXLayer<? extends JComponent> l) { processMouseEvent(e, l); } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorCardinalityTableModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTranferable.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTransferHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTree.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeCellRenderer.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/FactorTreeModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/model/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/sensitivity/wizard/SensitivityWizardHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -300,7 +300,7 @@ TopiaContext context = null; try { context = regionStorage.getStorage().beginTransaction(); - List list = context.find("from " + value.getClass().getName()); + List list = context.findAll("from " + value.getClass().getName()); JComboBox c = new JComboBox(list.toArray()); c.setSelectedItem(value); result = c; @@ -668,7 +668,7 @@ if (TopiaEntity.class.isAssignableFrom(type)) { try { TopiaContext context = getTopiaContext(factorWizardUI); - List list = context.find("from " + type.getName()); + List list = context.findAll("from " + type.getName()); JComboBox c = new JComboBox(list.toArray()); result = c; context.closeContext(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table> @@ -126,19 +126,19 @@ }); } } -protected void setPreScript() { +protected void initSimulationParams() { if (!isSensitivity()){ + // prescript String preScript = simulAction.getSimulationParameter().getPreScript(); fieldUseSimulPreScripts.setSelected(preScript != null && !preScript.isEmpty()); getParentContainer(SimulUI.class).getPreScriptUI().getFieldSimulPreScript().setText(preScript); - } -} -protected void setSimulationPlan() { - if (!isSensitivity()){ + + // simulation plan fieldSimulUseSimulationPlan.setSelected(simulAction.getSimulationParameter().getUseSimulationPlan()); getParentContainer(SimulUI.class).getSensUI().refresh(); } } + protected void setSensitivityTabRegion() { if (isSensitivity()) { try { @@ -159,24 +159,19 @@ } } } -protected void setFactor() { +protected void initSensitivityParams() { if (isSensitivity()) { + getParentContainer(SensitivityUI.class).getSensitivityChooserUI().refreshSelectedSensitivityAnalysis(); getParentContainer(SensitivityUI.class).getSensitivityTabUI().setFactorModel(); - } -} -protected void setExportSens() { - if (isSensitivity()) { getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setSensitivityExportListModel(); + sensitivityOnlyKeepFirstResultCheckBox.setSelected(simulAction.getSimulationParameter().isSensitivityAnalysisOnlyKeepFirst()); } } -protected void setSensitivityAnalysis() { - if (isSensitivity()){ - getParentContainer(SensitivityUI.class).getSensitivityChooserUI().refreshSelectedSensitivityAnalysis(); - } -} + public void setSimulationParameter(SimulAction simulAction){ simulAction.setSimulationParameter(simulAction.getSimulationParameter()); } + protected void loadOldSimulation() { final String selected = fieldSimulParamsSelect.getSelectedItem().toString(); // le premier item est " " pour ne pas avoir de selection par defaut @@ -190,11 +185,8 @@ fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName()); // mise a jour des années fieldSimulParamsNbAnnees.setText(String.valueOf(simulAction.getNumberOfYear())); - setPreScript(); - setSimulationPlan(); - setExportSens(); - setSensitivityAnalysis(); - setFactor(); + initSimulationParams(); + initSensitivityParams(); // regles ruleChooser.setRulesList(simulAction.getSimulationParameter().getRules()); @@ -489,14 +481,14 @@ <cell fill="horizontal" weightx="1.0"> <Table> <row> - <cell fill="horizontal" weightx="0.3"> + <cell fill="horizontal" weightx="1"> <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" selected='{simulAction.getSimulationParameter().getUsePreScript()}' visible='{!isSensitivity()}' onItemStateChanged='enablePreScript()' /> </cell> - <cell fill="horizontal" weightx="0.3"> + <cell fill="horizontal" weightx="1"> <JCheckBox text="isisfish.params.useSimulationPlan" id="fieldSimulUseSimulationPlan" selected='{simulAction.getSimulationParameter().getUseSimulationPlan()}' @@ -504,6 +496,14 @@ onItemStateChanged='enableSimulationPlan()' enabled="{getRegionStorage() != null}" /> </cell> + <cell fill="horizontal" weightx="1"> + <JCheckBox text="isisfish.params.sensitivityOnlyKeepFirstResult" + id="sensitivityOnlyKeepFirstResultCheckBox" + selected='{simulAction.getSimulationParameter().isSensitivityAnalysisOnlyKeepFirst()}' + visible='{isSensitivity()}' + onItemStateChanged='simulAction.getSimulationParameter().setSensitivityAnalysisOnlyKeepFirst(sensitivityOnlyKeepFirstResultCheckBox.isSelected())' + enabled="{getRegionStorage() != null}" /> + </cell> </row> </Table> </cell> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel layout='{new BorderLayout()}'> @@ -46,4 +46,4 @@ </JScrollPane> <JButton constraints='BorderLayout.SOUTH' text="isisfish.preScript.backParameter" onActionPerformed='getParentContainer(fr.ifremer.isisfish.ui.SimulationUI.class).selectParametersTab()'/> -</JPanel> \ No newline at end of file +</JPanel> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel layout='{new BorderLayout()}'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooser.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% @param : Region storage (context) @@ -122,4 +122,4 @@ </JScrollPane> </cell> </row> -</Table> \ No newline at end of file +</Table> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/RuleChooserHandler.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2011 Codelutin, Chatellier Eric + * Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <Table> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.SimulationUI> @@ -84,4 +84,4 @@ <AdvancedParamsUI id="advancedParamsUI" constructorParams='this' /> </tab> </JTabbedPane> -</fr.ifremer.isisfish.ui.SimulationUI> \ No newline at end of file +</fr.ifremer.isisfish.ui.SimulationUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialog.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.simulator.filter; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterDialogUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.widget.filter.FilterDialogUI modal="true"> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterPanelUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <fr.ifremer.isisfish.ui.widget.filter.FilterPanelUI> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/simulator/filter/SimulationFilterUtil.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.simulator.filter; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/ErrorHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IDialog.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisAction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/IsisActionWithBackup.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/JaxxUtil.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.util; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/TooltipHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/TooltipHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/util/TooltipHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/CommitDialogUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog modal="true" title='isisfish.vcs.commit'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateConfirmDialogUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog modal="true" title='isisfish.vcs.updateconfirm'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/UpdateDialogUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog modal="true" title='isisfish.vcs.update'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSConfigUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSGenerateSshKeyUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog title='isisfish.server.ssh.generateKey.title' modal='true'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/vcs/VCSPassPhraseUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog title='isisfish.vcs.ask.passphrase.title' modal='true'> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/FilterableComboBox.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/Interval.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalGraphic.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalLabel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/IntervalPanel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/EquationTableEditor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/MonthComponent.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/MonthComponent.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/MonthComponent.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ParameterTableCellEditor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -154,7 +154,7 @@ } TopiaContext context = regionStorage.getStorage().beginTransaction(); if (context != null) { - List list = context.find("from " + type.getName()); + List list = context.findAll("from " + type.getName()); c = new JComboBox(list.toArray()); c.setSelectedItem(value); editor = c; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ScriptParameterDialog.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ScriptParameterDialog.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/ScriptParameterDialog.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog modal="true" title="isisfish.simulation.script.autoconfigtitle"> @@ -91,4 +91,4 @@ </cell> </row> </Table> -</JDialog> \ No newline at end of file +</JDialog> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/editor/StepComponent.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/Acceptor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/Acceptor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/Acceptor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package fr.ifremer.isisfish.ui.widget.filter; @@ -39,4 +39,4 @@ T extract(Object args); boolean canUse(Object[] val); -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/AcceptorFactory.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/CompositeFilterAcceptor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/DateInterval.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/DateInterval.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/DateInterval.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterAcceptor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialog.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JDialog> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterPanelUI.jaxx 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <JPanel> Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterParamModel.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterParamModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/FilterParamModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ValueGetter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ValueGetter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/widget/filter/ValueGetter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ArgTypes.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Args.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Args.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Args.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/BitUtil.java (from rev 3799, trunk/src/main/java/fr/ifremer/isisfish/util/BitUtil.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/BitUtil.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/BitUtil.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,97 @@ +/* + * #%L + * IsisFish + * + * $Id: BitUtil.java 3671 2012-04-03 13:31:36Z echatellier $ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import org.apache.commons.lang3.StringUtils; + +/** + * Quelques methodes pour manipuler les bits d'un long. Ces methodes servent pour + * creer des marques pour les resultats mapper + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class BitUtil { + + /** + * Converti une chaine de maximum 8 carateres en un long representant cette + * chaine en ascii. + * @param s + * @return + */ + public static long toMark(String s) { + long result = 0; + s = StringUtils.rightPad(s, 8, ' '); + s = StringUtils.substring(s, 0, 8); + for (int i=0; i<8; i++) { + long b = (long)s.charAt(i); + // le 1er caractere doit etre le plus a gauche + // un long est sur 64 bit, on decale de 8 en 8 (byte) + result = result | (b << (64-(i+1)*8)); + } + return result; + } + + /** + * Convertie un long en sa representation String. Le long est en fait + * l'aggregation de 8 char (8x8bits). Les chars sont dans la table ascii + * @param l + * @return + */ + public static String fromMark(long l) { + long m = 0x00000000000000FF; // mask 255 + String result = ""; + for (int i=0; i<8; i++) { // on parcours chaque byte du long + long t = l >> 8*i; // on decale le caratere a lire a droite + char v = (char)(t & m); // on applique le mask pour ne garder que ce caratere + result = v + result; + } + return result; + } + + /** + * Montre les bits d'une nombre entier + * @param l + * @return + */ + public static String showBit(long l) { + long m = 0x0000000000000001; + String result = ""; + for (int i=0; i<64; i++) { + long t = l >> i; + long v = t & m; + result = v + result; + if (i!= 0 && i%8 == 0) { + result = " " + result; + } + } + return result; + } + +} Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java (from rev 3799, trunk/src/main/java/fr/ifremer/isisfish/util/Cache.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Cache.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,291 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import fr.ifremer.isisfish.IsisFishRuntimeException; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.TimeStep; +import java.lang.reflect.Method; +import java.util.Map; +import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codehaus.aspectwerkz.joinpoint.JoinPoint; +import org.nuiton.topia.persistence.TopiaEntity; + +/** + * Cache utilise pour mettre les resultats de methode durant la simulation + * pour minimiser les appels + * + * Created: 25 août 06 22:42:47 + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class Cache { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(Cache.class); + + // la longueur du package pour minimiser la longueur des topiaId + static final private int entityPackageLenght = "fr.ifremer.isisfish.entities.".length(); + // la valeur NULL a utilise a la place de null pour les timeStep + static final private Object NULL = new Object(); + +// static private List<CacheAspect> instances = new ArrayList<CacheAspect>(); + + protected long totalCall = 0; + protected long cacheUsed = 0; + + /** + * map<TimeStep, Map<Key, Value>> + * TimeStep peut etre null via l'objet NULL + * Key est la cle calcule par computeKey + * Value est la valeur du cache + * + * TimeStep est en WEAK pour que des que l'on passe au pas de temps suivant + * ils soit efface de la memoire si plus personne n'a de reference sur + * ce pas de temps. L'autre moyen est de force l'effacement via clear(TimeStep) + * + * Value est en SOFT reference pour que les valeurs soit effacee du cache + * lorsqu'il n'y a plus de place memoire + */ + protected Map cache = new ReferenceMap(ReferenceMap.WEAK, ReferenceMap.HARD); +// protected Map cache = new AdaptaptativeCache(1000, 95); + + public Cache() { + } + + /** + * Return trace object from context. + * + * @return trace object from context + */ + protected Trace getTrace() { + SimulationContext context = SimulationContext.get(); + Trace result = context.getTrace(); + return result; + } + + /** + * Recupere pour un pas de temps donnes une valeur calcule pour une cle + * @param step le pas de temps pour lequel on souhaite ajouter (ou null) + * @param key la cle de storage + * @param defaultValue la valeur par defaut a retourner si elle n'est pas en cache + * si defaultValue est une JoinPoint alors un proceed est appele dessus et le + * resultat de l'appel est utiliser comme valeur par defaut + * @return la valeur dans le cache ou defaultValue + */ + public Object get(Method method, Object[] args, Object defaultValue) throws Throwable { + totalCall++; + + Object result = null; + if (method.getAnnotation(Nocache.class) != null || + method.getDeclaringClass().getAnnotation(Nocache.class) != null) { + result = realCall(defaultValue); + } else { + // compute key and keep TimeStep objet + StringBuilder sbKey = new StringBuilder(); + // le pas de temps trouve dans les arguments + TimeStep step = computeKey(sbKey, method, args); + + // on recupere le intern de la String car normalement en cache on + // retrouve souvent les memes chaines comme cle (sinon le cache + // servirait a rien :D) + Object key = sbKey.toString().intern(); + result = get(step, key); + if (result == null) { + + // computation increment (/ by 0) + // FIXME need to be called, but fail with empty stack + //getTrace().traceAfterComputation(method); + + result = realCall(defaultValue); + if (result != null) { // util pour les methodes retournant void, ne fonctionne pas si on met AND !execute(void *(..)) dans l'aspect. En fait fonction seulement si utilisé avec les traces :( + put(step, key, result); + } + } else { + cacheUsed++; + } + } + return result; + } + + protected TimeStep computeKey(StringBuilder sbKey, Method method, Object[] args) { + TimeStep result = null; + sbKey.append(method.getDeclaringClass().getSimpleName()); + sbKey.append("."); + sbKey.append(method.getName()); + for (Object o : args) { + sbKey.append(";"); + if (o == null) { + sbKey.append("null"); + } else if (o instanceof Number || o instanceof String) { + sbKey.append(o.toString()); + } else if (o instanceof TimeStep) { + result = (TimeStep)o; + sbKey.append(((TimeStep)o).getStep()); + } else if (o instanceof TopiaEntity) { + sbKey.append( ((TopiaEntity)o).getTopiaId().substring(entityPackageLenght)); + } else { + // on minimise en prenant que le nom de la classe (pas le package) + sbKey.append(o.getClass().getSimpleName()); + sbKey.append('@'); + // et en lui ajoutant son adresse memoire en Hexa + sbKey.append(Integer.toHexString(System.identityHashCode(o))); + } + } + return result; + } + + protected Map getCacheTimeStep(TimeStep step) { + Object key = step; + if (step == null) { + key = NULL; + } + Map result = (Map)cache.get(key); + if (result == null) { + result = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); + cache.put(key, result); + } + return result; + } + + protected Object get(TimeStep step, Object key) { + Object result = null; + Map cacheTimeStep = getCacheTimeStep(step); + if (cacheTimeStep != null) { + result = cacheTimeStep.get(key); + } + return result; + } + + protected void put(TimeStep step, Object key, Object value) { + getCacheTimeStep(step).put(key, value); + } + + /** + * On fait l'appel reel dans une autre methode pour pouvoir le savoir + * dans les traces + * + * @param jp + * @return ? + * @throws Throwable + */ + protected Object realCall(Object defaultValue) throws Throwable { + Object result = defaultValue; + if (defaultValue instanceof JoinPoint) { + result = ((JoinPoint)defaultValue).proceed(); + } + return result; + } + + /** + * remove all values in cache + */ + public void clear() { + cache.clear(); + } + + /** + * remove all values in cache for the specied TimeStep + */ + public void clear(TimeStep step) { + Object key = step; + if (key == null) { + key = NULL; + } + cache.remove(key); + } + + /** + * @return Returns the cacheUsed. + */ + public long getCacheUsed() { + long result = cacheUsed; + return result; + } + + /** + * @return Returns the totalCall. + */ + public long getTotalCall() { + long result = totalCall; + return result; + } + + /** + * Affiche les statistiques + * + */ + public String printStatistiqueAndClear() { + StringBuilder result = new StringBuilder(); + result.append("--- Cache Statistiques ---\n"); + result.append("Total call: ").append(totalCall).append("\n"); + result.append("Cache used: ").append(cacheUsed).append("\n"); + long percent = 0; + if (totalCall != 0) { + percent = 100*cacheUsed/totalCall; + } + result.append("Cache usage: ").append(percent).append("%\n"); + result.append("--------------------\n"); + cache.clear(); + + System.out.println(result.toString()); + return result.toString(); + } + + // EN COURS D'ECRITURE MAIS JAMAIS FINI :( + // l'idee est de prendre la place memoire qu'il y a, mais s'il n'y en + // a plus on commence par enlever les objets les plus vieux +// class AdaptaptativeCache extends LinkedHashMap<String, Object> { +// protected int maxMemory = 95; +// /** +// * +// * @param capacity initial capacity +// * @param maxMemory maximum memory used (0-100) +// */ +// public AdaptaptativeCache(int capacity, int maxMemory) { +// super(capacity, 0.75f, true); +// this.maxMemory = maxMemory; +// } +// +// /* (non-Javadoc) +// * @see java.util.LinkedHashMap#removeEldestEntry(java.util.Map.Entry) +// */ +// @Override +// protected boolean removeEldestEntry(Entry<String, Object> eldest) { +// double free = 100.0 * Runtime.getRuntime().freeMemory() / Runtime.getRuntime().maxMemory() ; +// boolean result = 100 - free > maxMemory; +// return result; +// } +// } +} + + Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CellPointcomparator.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/CompileHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -41,7 +41,6 @@ import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; import javax.tools.StandardJavaFileManager; -import javax.tools.StandardLocation; import javax.tools.ToolProvider; import org.apache.commons.lang3.StringUtils; @@ -240,6 +239,8 @@ args.add("-g"); // Show a description of each use or override of a deprecated member or class. args.add("-deprecation"); + args.add("-encoding"); + args.add("utf-8"); args.add("-classpath"); args.add(classpathAsString); args.add("-d"); @@ -385,96 +386,4 @@ } return result; } - - /*protected static CodepageDetectorProxy getCodepageDetector() { - - if (detector == null) { - detector = CodepageDetectorProxy.getInstance(); // A singleton. - - // Add the implementations of info.monitorenter.cpdetector.io.ICodepageDetector: - // This one is quick if we deal with unicode codepages: - detector.add(new ByteOrderMarkDetector()); - // The first instance delegated to tries to detect the meta charset attribut in html pages. - detector.add(new ParsingDetector(true)); // be verbose about parsing. - // This one does the tricks of exclusion and frequency detection, if first implementation is - // unsuccessful: - detector.add(JChardetFacade.getInstance()); // Another singleton. - detector.add(ASCIIDetector.getInstance()); // Fallback, see javadoc. - } - return detector; - }*/ - - /* - * Convert all files to UTF-8. - * - * @param files fiels to convert - * @return converted file list - * - public static List<File> convertToUnicode(List<File> files) { - - CodepageDetectorProxy myDetector = getCodepageDetector(); - - for (File file : files) { - try { - Charset charset = myDetector.detectCodepage(file.toURI().toURL()); - - if (log.isDebugEnabled()) { - log.debug("Charset for " + file.getAbsolutePath() + " is " + charset); - } - - if (charset != null && !charset.name().equalsIgnoreCase("utf-8")) { - - if (log.isDebugEnabled()) { - log.debug("Convert " + file.getAbsolutePath() + " to unicode"); - } - - File tmpFile = File.createTempFile(file.getName(), ".copy"); - tmpFile.deleteOnExit(); - - // direct copy - InputStream is = new FileInputStream(file); - OutputStream os = new FileOutputStream(tmpFile); - try { - IOUtils.copy(is, os); - } - finally { - is.close(); - os.close(); - } - - // copy using cp transaltion - is = new FileInputStream(tmpFile); - os = new FileOutputStream(file); - Reader ir = new InputStreamReader(is, charset); - Writer ow = new OutputStreamWriter(new FileOutputStream(file), "utf-8"); - try { - IOUtils.copy(ir, ow); - } - finally { - ir.close(); - ow.close(); - is.close(); - os.close(); - } - - } - else { - if (log.isDebugEnabled()) { - log.debug("File " + file.getAbsolutePath() + " already in unicode : skip"); - } - } - } catch (MalformedURLException e) { - if (log.isErrorEnabled()) { - log.error("Can't convert file in unicode", e); - } - } catch (IOException e) { - if (log.isErrorEnabled()) { - log.error("Can't convert file in unicode", e); - } - } - - } - - return files; - }*/ } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ConverterUtil.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2006 - 2010 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin + * Copyright (C) 2006 - 2012 Ifremer, Code Lutin, Cédric Pineau, Benjamin Poussin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -36,6 +36,8 @@ import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.types.RangeOfValues; import fr.ifremer.isisfish.types.TimeUnit; +import java.util.Map; +import java.util.WeakHashMap; /** * ConverterUtil. @@ -50,28 +52,43 @@ */ public class ConverterUtil { + //static protected Map<TopiaContext, ConvertUtilsBean> cache = new WeakHashMap<TopiaContext, ConvertUtilsBean>(); + static protected ConvertUtilsBean nullConverter = getConverterNoCache(null); + public static ConvertUtilsBean getConverter(TopiaContext context) { - BeanUtilsBean result = BeanUtilsBean.getInstance(); - ConvertUtilsBean cub = result.getConvertUtils(); + ConvertUtilsBean result; + if (context == null) { + result = nullConverter; + } else { + /*result = cache.get(context); + if (result == null) {*/ + result = getConverterNoCache(context); + //} + } + return result; + } + protected static ConvertUtilsBean getConverterNoCache(TopiaContext context) { + BeanUtilsBean bub = BeanUtilsBean.getInstance(); + ConvertUtilsBean result = bub.getConvertUtils(); + //cache.put(context, result); + // mise en place de converter de string vers des objet ... - cub.register(new TopiaEntityConverter(context), TopiaEntity.class); - cub.register(new TimeStepConverter(), TimeStep.class); - cub.register(new MonthConverter(), Month.class); - cub.register(new TimeUnitConverter(), TimeUnit.class); - cub.register(new RangeOfValuesConverter(), RangeOfValues.class); - + result.register(new TopiaEntityConverter(context), TopiaEntity.class); + result.register(new TimeStepConverter(), TimeStep.class); + result.register(new MonthConverter(), Month.class); + result.register(new TimeUnitConverter(), TimeUnit.class); + result.register(new RangeOfValuesConverter(), RangeOfValues.class); + // Not used since mexico file format use // Still used in sensivity analysis prescript - cub.register(new MatrixConverter(), MatrixND.class); + result.register(new MatrixConverter(), MatrixND.class); // dans les prescripts generé on a MatrixNDImpl.class // c'est tres étrange, mais ca ne fonctionne pas par MatrixND.class - cub.register(new MatrixConverter(), MatrixNDImpl.class); + result.register(new MatrixConverter(), MatrixNDImpl.class); // ... et inversement - cub.register(new StringConverter(), String.class); - - return cub; + result.register(new StringConverter(), String.class); + return result; } - } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Doc.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Doc.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Doc.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Docable.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Docable.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Docable.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/EvaluatorHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -36,6 +36,7 @@ import java.util.List; import java.util.Map; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.FileUtil; @@ -94,9 +95,9 @@ Method interfaceMethod = methods[0]; String content = generateContent(packageName, className, interfaceMethod, script); - - FileUtil.writeString(src, content); + FileUtils.writeStringToFile(src, content, "utf-8"); + int compileResult = CompileHelper.compile(src.getParentFile(), src, src.getParentFile(), out); File dest = new File(src.getParentFile(), className + ".class"); dest.deleteOnExit(); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -28,8 +28,13 @@ import org.nuiton.math.matrix.SemanticMapper; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaDAO; +import org.nuiton.topia.persistence.TopiaEntity; import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.entities.PopulationDAO; +import fr.ifremer.isisfish.entities.PopulationGroup; +import fr.ifremer.isisfish.entities.PopulationGroupDAO; import fr.ifremer.isisfish.simulator.SimulationContext; /** @@ -64,8 +69,13 @@ try { clazz = Class.forName("fr.ifremer.isisfish.entities." + typeName); } catch (Exception ex) { - log.warn("Can't find class for " + typeName, ex); - clazz = String.class; + try { + clazz = Class.forName("fr.ifremer.isisfish.types." + typeName); + } catch (Exception ex2) { + log.warn("Can't find class for name " + typeName, ex2); + clazz = String.class; + } + } return clazz; } @@ -84,9 +94,36 @@ // In simulation context : Object value = null; try { - TopiaContext context = SimulationContext.get().getDB(); - TopiaDAO dao = IsisFishDAOHelper.getDAO(context, type); - value = dao.findByProperty("name", valueId); + // les populations groupes sont speciaux car ils n'ont pas de + // noms. Dans l'import il sont composé du nom de la population + // et du numero de groupe séparé par +. + if (PopulationGroup.class.isAssignableFrom(type)) { + int separatorIndex = valueId.indexOf('+'); + if (separatorIndex >= 0) { + String popName = valueId.substring(0, separatorIndex); + int groupId = Integer.parseInt(valueId.substring(separatorIndex + 1)); + + TopiaContext context = SimulationContext.get().getDB(); + PopulationDAO populationDao = IsisFishDAOHelper.getPopulationDAO(context); + PopulationGroupDAO populationGroupDAO = IsisFishDAOHelper.getPopulationGroupDAO(context); + Population population = populationDao.findByName(popName); + value = populationGroupDAO.findByProperties( + PopulationGroup.PROPERTY_POPULATION, population, + PopulationGroup.PROPERTY_ID, groupId); + } else { + if (log.isWarnEnabled()) { + log.warn("PopulationGroup identifiant doesn't contains '+' separator"); + } + value = valueId; + } + } + else if (TopiaEntity.class.isAssignableFrom(type)) { + TopiaContext context = SimulationContext.get().getDB(); + TopiaDAO dao = IsisFishDAOHelper.getDAO(context, type); + value = dao.findByProperty("name", valueId); + } else { + value = ConverterUtil.getConverter(null).convert(valueId, type); + } } catch (Exception ex) { log.warn("Can't get value for " + valueId, ex); value = valueId; Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/JavadocHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/MatrixConverter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/MonthConverter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Copied: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Nocache.java (from rev 3799, trunk/src/main/java/fr/ifremer/isisfish/util/Nocache.java) =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Nocache.java (rev 0) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Nocache.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,47 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Code Lutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Annotation pour specifier à l'aspect du cache que l'on ne souhaite ne pas + * mettre en cache l'appel d'une méthode ou des méthodes d'une classe. + * + * @author echatellier + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.METHOD, ElementType.TYPE}) +public @interface Nocache { + +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/RangeOfValuesConverter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -56,5 +56,3 @@ } } - - Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/StringConverter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/StringConverter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TimeStepConverter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TimeStepConverter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TimeStepConverter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TimeUnitConverter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/TopiaEntityConverter.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Trace.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Trace.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/Trace.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -71,17 +71,13 @@ /** heure de depart de l'appel a la methode (avec le temps des autres methodes) */ final static private int STACK_TIME_START_NEST_METHOD = 2; - - protected String name = ""; - /** array : [call's numbers, call do, min time, max time, total time, total time with child]*/ protected Map<String, long[]> statistics = new LinkedHashMap<String, long[]>(); /** array : [nest e call, start time, start time with child] */ protected Stack<long[]> callStack = new Stack<long[]>(); - public Trace(String name) { - this.name = name; + public Trace() { } public long[] getStatistics(Object e) { @@ -93,7 +89,14 @@ } return result; } - + + /** + * Clear current value statistics (all is reset) + */ + public void clear() { + statistics.clear(); + } + public void traceBefore () { // ajout dans le stack long current = System.nanoTime(); @@ -167,7 +170,7 @@ long call = 0; long computation = 0; StringBuffer result = new StringBuffer(); - result.append("--- " + name + " Statistics ---\n"); + result.append("--- " + " Statistics ---\n"); for (String e : statistics.keySet()) { long[] stat = getStatistics(e); Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/InvalidPassphraseException.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/ProgressMonitor.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHAgent.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHException.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUserInfo.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/SSHUtils.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/util/ssh/package-info.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ /** Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/AbstractVCS.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCS.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSActionEvent.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSActionEvent.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSActionEvent.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSException.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSFactory.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSNone.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VCSSVN.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -1240,4 +1240,4 @@ return filesInConflict; } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VetoableActionListener.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VetoableActionListener.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/VetoableActionListener.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/package.html =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/package.html 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/vcs/package.html 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <html> @@ -61,4 +61,4 @@ </ul> </p> </body> -</html> \ No newline at end of file +</html> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Cell-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 -2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/FisheryRegion-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Gear-gear-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Metier-metier-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Population-basics-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Port-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Port-warning-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="cell"> <field-validator type="fieldexpression"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/SetOfVessels-basics-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Species-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Strategy-basics-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/TripType-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/VesselType-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Zone-error-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="name"> <field-validator type="requiredstring"> Modified: branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml =================================================================== --- branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/fr/ifremer/isisfish/entities/Zone-warning-validation.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 2011 Ifremer, Codelutin, Chatellier Eric + Copyright (C) 2011 - 2012 Ifremer, Codelutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,12 +17,12 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <!DOCTYPE validators PUBLIC - "-//OpenSymphony Group//XWork Validator 1.0.2//EN" - "http://www.opensymphony.com/xwork/xwork-validator-1.0.2.dtd"> + "-//Apache Struts//XWork Validator 1.0.3//EN" + "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> <field name="cell"> <field-validator type="fieldexpression"> Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_en_GB.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -162,6 +162,8 @@ isisfish.config.category.misc.description=Miscealenous isisfish.config.category.officialvcs=Official VCS isisfish.config.category.officialvcs.description=Official VCS repository +isisfish.config.category.simulation=Simulations +isisfish.config.category.simulation.description=Simulation execution configuration isisfish.config.database.lockmode.description=Database lock mode isisfish.config.main.compileDirectory.description=Script compilation directory isisfish.config.main.configFileName.description=Configuration filename @@ -183,6 +185,7 @@ isisfish.config.main.performvcsupdate.description=Perform vcs update isisfish.config.main.remoteCaparmor.description=Remote simulator launcher name isisfish.config.main.script.autoconfig.description=Display a dialog to force script configuration +isisfish.config.main.simulation.in.max.threads.description=Max threads count in current process isisfish.config.main.simulation.ssh.control.check.interval=Control check interval (seconds) isisfish.config.main.simulation.ssh.control.check.interval.description=Control check interval (seconds) isisfish.config.main.simulation.ssh.datapath=ISIS-Fish database @@ -191,6 +194,8 @@ isisfish.config.main.simulation.ssh.isis.home.description=ISIS-Fish installation directory isisfish.config.main.simulation.ssh.javapath=Java path isisfish.config.main.simulation.ssh.javapath.description=Java location on remote server (full path or relative to $PATH, by default value is caparmor configuration) +isisfish.config.main.simulation.ssh.max.memory=Ssh simulation Xmx allocated memory +isisfish.config.main.simulation.ssh.max.memory.description=Ssh simulation Xmx allocated memory isisfish.config.main.simulation.ssh.max.threads=SSH threads count isisfish.config.main.simulation.ssh.max.threads.description=Number of simultaneous simulations to do through SSH. Might only be usefull for dependent analysis plans. Otherwise keep value at '1'. isisfish.config.main.simulation.ssh.pbsbinpath=PBS executables directory @@ -205,11 +210,14 @@ isisfish.config.main.simulation.ssh.userhome.description=User home directory isisfish.config.main.simulation.ssh.username=SSH identifier isisfish.config.main.simulation.ssh.username.description=SSH identifier +isisfish.config.main.simulation.sub.max.memory.description=Sub process simulation Xmx allocated memory +isisfish.config.main.simulation.sub.max.process.description=Max sub process count (using -1 value will use available processor count) isisfish.config.main.simulationShowOnlyError.description= isisfish.config.main.smtpServer.description=Smtp server address isisfish.config.main.subSimulator.description=Sub process simulator launcher name isisfish.config.main.userMail.description=User email address isisfish.config.main.userName.description=User name +isisfish.config.mapped.result.matrix.vector.class.description= isisfish.config.ssh.key.file=SSH key isisfish.config.ssh.key.file.description=Private SSH key path isisfish.config.title=Preferences @@ -561,6 +569,7 @@ isisfish.message.directory.not.exists= isisfish.message.evaluation.finished=evaluation finished isisfish.message.export.done=export done +isisfish.message.export.export=Exporting results isisfish.message.file.already.exists=File %s already exists, do you want overwrite it ? isisfish.message.file.overwrite=File exists, do you want overwrite it ? isisfish.message.import=Import %1$s @@ -645,6 +654,7 @@ isisfish.params.rules.availables=Available rules isisfish.params.rules.selected=Selected rules isisfish.params.sensitivityName=Sensitivity name +isisfish.params.sensitivityOnlyKeepFirstResult=Only keep results for first simulation isisfish.params.simulationLauncher=Simulation launcher isisfish.params.simulationName=Simulation name isisfish.params.stategiesAndPopulations=Strategies and populations @@ -676,6 +686,8 @@ isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Warning, running groups creation wizard will delete all existing groups and objects which depend on it.\nDo you want to re-create groups ? isisfish.populationBasics.geographicID=Geographic identifier +isisfish.populationBasics.groupMax=Max group +isisfish.populationBasics.groupMin=Min group isisfish.populationBasics.growth=Growth isisfish.populationBasics.growthReverse=Reverse growth isisfish.populationBasics.name=Name @@ -869,7 +881,11 @@ isisfish.sensitivity.factors=Factors isisfish.sensitivity.increment=Cardinality isisfish.sensitivity.methodfactorsupported=The selected sensitivity method handles factors cardinalities -isisfish.sensitivity.moveillegal=Can't move finite discrete factor to continuous group \! +isisfish.sensitivity.mexico.exporttoxml.approve=Export +isisfish.sensitivity.mexico.exporttoxml.filter=Xml files +isisfish.sensitivity.mexico.exporttoxml.tip=Export factors to mexico xml file +isisfish.sensitivity.mexico.exporttoxml.title=Export factors to mexico xml file +isisfish.sensitivity.moveillegal=Can't move discrete factor to continuous group \! isisfish.sensitivity.name=Factor name isisfish.sensitivity.newfactorcgroup.tip=Add new continuous factors group isisfish.sensitivity.newfactordgroup.tip=Add new finite discrete factors group @@ -981,6 +997,7 @@ isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Delete isisfish.variables.double.value=Real value \: +isisfish.variables.entityname=Object name \: isisfish.variables.matrix.value=Matrix \: isisfish.variables.savevariable=Save isisfish.variables.tabtitle=Variables Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -162,6 +162,8 @@ isisfish.config.category.misc.description=Divers isisfish.config.category.officialvcs=VCS Officiel isisfish.config.category.officialvcs.description=Dépôt contenant les scripts officiels +isisfish.config.category.simulation=Simulations +isisfish.config.category.simulation.description=Configuration des simulations isisfish.config.database.lockmode.description=Méthode de vérouillage à utiliser pour la base de données isisfish.config.main.compileDirectory.description=le répertoire où sont compilés les scripts isisfish.config.main.configFileName.description=le fichier de configuration à utiliser @@ -183,6 +185,7 @@ isisfish.config.main.performvcsupdate.description=Met à jour le dépôt VCS isisfish.config.main.remoteCaparmor.description=Nom du lanceur de simulation distante isisfish.config.main.script.autoconfig.description=Affiche une fenêtre pour forcer la configuration des scripts +isisfish.config.main.simulation.in.max.threads.description=Nombre de thread maximum dans le processus courant isisfish.config.main.simulation.ssh.control.check.interval=Vérification de la progression (secondes) isisfish.config.main.simulation.ssh.control.check.interval.description=Temps d'attente en secondes entre deux vérifications de progression isisfish.config.main.simulation.ssh.datapath=Base de données @@ -191,6 +194,8 @@ isisfish.config.main.simulation.ssh.isis.home.description=Emplacement d'installation d'ISIS-Fish sur le serveur isisfish.config.main.simulation.ssh.javapath=Emplacement de java isisfish.config.main.simulation.ssh.javapath.description=Emplacement de java sur le serveur (chemin total, ou relatif au $PATH, par défaut la valeur est celle de caparmor) +isisfish.config.main.simulation.ssh.max.memory=Quantité de mémoire allouée +isisfish.config.main.simulation.ssh.max.memory.description=Quantité de mémoire maximum allouée (Xmx) isisfish.config.main.simulation.ssh.max.threads=Nombre de thread SSH isisfish.config.main.simulation.ssh.max.threads.description=Nombre de simulation simultanée à faire en SSH. Attention, ne doit être utilisé que pour faire plusieurs plans de simulation dépendants en même temps, sinon laisser '1'. isisfish.config.main.simulation.ssh.pbsbinpath=Emplacement des executables PBS @@ -205,11 +210,14 @@ isisfish.config.main.simulation.ssh.userhome.description=Répertoire d'accueil de l'utilisateur isisfish.config.main.simulation.ssh.username=Identifiant isisfish.config.main.simulation.ssh.username.description=Identifiant SSH pour se connecter au serveur +isisfish.config.main.simulation.sub.max.memory.description=Quantité de mémoire maximum allouée au sous processus +isisfish.config.main.simulation.sub.max.process.description=Nombre maximum de sous processus (une valeur de -1 utilisera le nombre de processeur disponible) isisfish.config.main.simulationShowOnlyError.description=pour indiquer si l'on doit conserver dans l'UI des simulations terminées uniquement celles avec erreur isisfish.config.main.smtpServer.description=le nom du serveur smtp à utiliser pour envoyer les courriels isisfish.config.main.subSimulator.description=Nom du simulateur en sous processus isisfish.config.main.userMail.description=le courriel de l'utilisateur isisfish.config.main.userName.description=le nom - prénom de l'utilisateur +isisfish.config.mapped.result.matrix.vector.class.description= isisfish.config.ssh.key.file=Clé SSH isisfish.config.ssh.key.file.description=Emplacement de la clé privée SSH isisfish.config.title=Préférences @@ -561,6 +569,7 @@ isisfish.message.directory.not.exists= isisfish.message.evaluation.finished=évaluation terminée isisfish.message.export.done=Export terminé +isisfish.message.export.export=Export des résultats isisfish.message.file.already.exists=Le fichier %s existe, voulez-vous l'écraser ? isisfish.message.file.overwrite=Le fichier existe, voulez-vous l'écraser ? isisfish.message.import=Importer %1$s @@ -645,6 +654,7 @@ isisfish.params.rules.availables=Règles disponibles isisfish.params.rules.selected=Règles sélectionnées isisfish.params.sensitivityName=Nom de l'analyse de sensibilité +isisfish.params.sensitivityOnlyKeepFirstResult=Ne conserver les résultats que pour la première simulation. isisfish.params.simulationLauncher=Lanceur de simulation isisfish.params.simulationName=Nom de la simulation isisfish.params.stategiesAndPopulations=Stratégies et populations @@ -676,6 +686,8 @@ isisfish.population.zones=Zones isisfish.populationBasics.confirmCreateGroups=Attention, la re-création des groupes supprimera les groupes existants et tous les objets qui en dépendent.\nÊtes vous sur de vouloir re-créer les groupes ? isisfish.populationBasics.geographicID=Identifiant géographique +isisfish.populationBasics.groupMax=Group max +isisfish.populationBasics.groupMin=Group min isisfish.populationBasics.growth=Croissance isisfish.populationBasics.growthReverse=Croissance inverse isisfish.populationBasics.name=Nom @@ -869,7 +881,11 @@ isisfish.sensitivity.factors=Facteurs isisfish.sensitivity.increment=Cardinalité isisfish.sensitivity.methodfactorsupported=La méthode de sensibilité choisie gère les cardinalités des facteurs -isisfish.sensitivity.moveillegal=Impossible d'ajouter un facteur discret fini dans un groupe continu \! +isisfish.sensitivity.mexico.exporttoxml.approve=Exporter +isisfish.sensitivity.mexico.exporttoxml.filter=Fichier XML +isisfish.sensitivity.mexico.exporttoxml.tip=Exporter les facteurs vers un fichier xml mexico +isisfish.sensitivity.mexico.exporttoxml.title=Exporter les facteurs vers un fichier xml mexico +isisfish.sensitivity.moveillegal=Impossible d'ajouter un facteur discret dans un groupe continu \! isisfish.sensitivity.name=Nom du facteur isisfish.sensitivity.newfactorcgroup.tip=Ajouter un groupe de facteurs continus isisfish.sensitivity.newfactordgroup.tip=Ajouter un groupe de facteurs discrets finis @@ -981,6 +997,7 @@ isisfish.variables.defaultname=VarName isisfish.variables.deletevariable=Supprimer isisfish.variables.double.value=Valeur réelle \: +isisfish.variables.entityname=Nom de l'objet \: isisfish.variables.matrix.value=Matrice isisfish.variables.savevariable=Sauver isisfish.variables.tabtitle=Variables Modified: branches/4.0.1/src/main/resources/jnlp/index.html =================================================================== --- branches/4.0.1/src/main/resources/jnlp/index.html 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/jnlp/index.html 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <html> Modified: branches/4.0.1/src/main/resources/log4j.properties =================================================================== --- branches/4.0.1/src/main/resources/log4j.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/log4j.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of the +# published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-2.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### # Global logging configuration Modified: branches/4.0.1/src/main/resources/sensitivity.properties =================================================================== --- branches/4.0.1/src/main/resources/sensitivity.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/sensitivity.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of the +# published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-2.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### # this file contains authorized entities factors creation @@ -38,6 +38,8 @@ Gear.standardisationFactor Metier.gearParameterValue Population.capturability +Population.groupMax +Population.groupMin Population.growth Population.growthReverse Population.maturityOgiveEquation @@ -72,4 +74,4 @@ VesselType.maxTripDuration VesselType.minCrewSize VesselType.speed -VesselType.unitFuelCostOfTravel \ No newline at end of file +VesselType.unitFuelCostOfTravel Modified: branches/4.0.1/src/main/resources/templates/script/equation.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/equation.ftl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/templates/script/equation.ftl 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> // ${name} Modified: branches/4.0.1/src/main/resources/templates/script/export.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/export.ftl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/templates/script/export.ftl 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> /* @@ -100,4 +100,4 @@ public void export(SimulationStorage simulation, Writer out) throws Exception { // put your code here, and write export with: out.write("...") } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/resources/templates/script/rule.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/rule.ftl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/templates/script/rule.ftl 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> /* @@ -142,4 +142,4 @@ public void postAction(SimulationContext context, TimeStep step, Metier metier) throws Exception { // TODO } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/resources/templates/script/script.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/script.ftl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/templates/script/script.ftl 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> /* @@ -67,4 +67,4 @@ // add your method here -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityanalysis.ftl 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> /* @@ -138,4 +138,4 @@ File outputdirectory) throws SensitivityException { } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/templates/script/sensitivityexport.ftl 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> /* @@ -100,4 +100,4 @@ public void export(SimulationStorage simulation, Writer out) throws Exception { // put your code here, and write export with: out.write("...") } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/templates/script/simulationplan.ftl 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> /* @@ -141,4 +141,4 @@ return true; } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/resources/templates/script/simulator.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/templates/script/simulator.ftl 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> /* @@ -71,4 +71,4 @@ public void simulate(SimulationContext context) throws Exception { // put your code here } -} \ No newline at end of file +} Modified: branches/4.0.1/src/main/resources/templates/ssh/qsub-script.ftl =================================================================== --- branches/4.0.1/src/main/resources/templates/ssh/qsub-script.ftl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/templates/ssh/qsub-script.ftl 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> #!/bin/csh @@ -29,7 +29,7 @@ setenv R_HOME /appli/R/2.15.0-gnu-4.3/lib64/R setenv LD_LIBRARY_PATH ${r"${R_HOME}"}/lib -<#assign commonCommand="${javapath} -Djava.library.path=jri64 -DR.type=jni -Xmx2000M -jar isis-fish*.jar" /> +<#assign commonCommand="${javapath} -Djava.library.path=jri64 -DR.type=jni -Xmx${javamemory} -jar isis-fish*.jar" /> <#assign commonOptions="--option launch.ui false --option perform.vcsupdate false --option perform.migration false --option perform.cron false" /> <#if qsubmutiplejob> <#-- localsimulationid is short simulation id version --> Modified: branches/4.0.1/src/main/resources/v2xsl/isis-fish-0_1.3.1.xsl =================================================================== --- branches/4.0.1/src/main/resources/v2xsl/isis-fish-0_1.3.1.xsl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/v2xsl/isis-fish-0_1.3.1.xsl 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.3.1_1.5.xsl =================================================================== --- branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.3.1_1.5.xsl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.3.1_1.5.xsl 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.5_1.9.xsl =================================================================== --- branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.5_1.9.xsl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.5_1.9.xsl 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.9.1_2.0.xsl =================================================================== --- branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.9.1_2.0.xsl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.9.1_2.0.xsl 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.9_1.9.1.xsl =================================================================== --- branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.9_1.9.1.xsl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/v2xsl/isis-fish-1.9_1.9.1.xsl 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.0_2.1.xsl =================================================================== --- branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.0_2.1.xsl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.0_2.1.xsl 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.1_2.2.xsl =================================================================== --- branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.1_2.2.xsl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.1_2.2.xsl 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.2_2.3.xsl =================================================================== --- branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.2_2.3.xsl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/v2xsl/isis-fish-2.2_2.3.xsl 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/main/resources/v2xsl/isis-fish-cleaner.xsl =================================================================== --- branches/4.0.1/src/main/resources/v2xsl/isis-fish-cleaner.xsl 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/resources/v2xsl/isis-fish-cleaner.xsl 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2010 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> @@ -39,4 +39,4 @@ <xsl:template match="/dbobjects/dbobject[@type='ScriptObject' or @type='ScriptMethod' or @type='Simulation' or @type='RegleGestion']"> </xsl:template> -</xsl:stylesheet> \ No newline at end of file +</xsl:stylesheet> Modified: branches/4.0.1/src/main/xmi/isis-fish.properties =================================================================== --- branches/4.0.1/src/main/xmi/isis-fish.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/main/xmi/isis-fish.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of the +# published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-2.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### model.tagvalue.copyright=/* Copyright (C) 1999 - 2012 Ifremer - Code Lutin */ @@ -58,5 +58,5 @@ fr.ifremer.isisfish.entities.VesselType.class.tagvalue.contextable=true fr.ifremer.isisfish.entities.Zone.class.tagvalue.contextable=true -#�fix lazy exception on sensitivity export +#�fix lazy exception on sensitivity export fr.ifremer.isisfish.entities.Population.attribute.maturityOgiveEquation.tagvalue.lazy=false Modified: branches/4.0.1/src/main/xmi/isis-fish.zargo =================================================================== (Binary files differ) Modified: branches/4.0.1/src/site/en/rst/index.rst =================================================================== --- branches/4.0.1/src/site/en/rst/index.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/en/rst/index.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ========= Modified: branches/4.0.1/src/site/resources/css/site.css =================================================================== --- branches/4.0.1/src/site/resources/css/site.css 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/resources/css/site.css 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ #paypal { Modified: branches/4.0.1/src/site/resources/downloads/Exemple_PlanAnalyse.java =================================================================== --- branches/4.0.1/src/site/resources/downloads/Exemple_PlanAnalyse.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/resources/downloads/Exemple_PlanAnalyse.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,323 +19,323 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package analyseplans; - -import static org.codelutin.i18n.I18n._; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import scripts.ResultName; - -import java.io.*; -import java.io.File; -import java.io.FileReader; -import java.io.Writer; -import java.util.*; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; - -import org.codelutin.math.matrix.*; -import org.codelutin.util.*; -import org.codelutin.topia.*; - -import fr.ifremer.isisfish.*; -import fr.ifremer.isisfish.types.*; -import fr.ifremer.isisfish.rule.Rule; -import fr.ifremer.isisfish.rule.RuleHelper; -import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.entities.*; -import fr.ifremer.isisfish.simulator.AnalysePlan; -import fr.ifremer.isisfish.simulator.AnalysePlanContext; -import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.datastore.RegionStorage; -import fr.ifremer.isisfish.datastore.RuleStorage; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.datastore.ResultStorage; - -/* - * Exemple_PlanAnalyse.java - * - * Created: 6 juin 2007 - * - * @author sl - * @version $Revision: 3.1.3 $ - * - * Last update: $Date: 2008/12/01 09:29:18 $ - * by : $Author: sl $ - */ - -/** - * Le principe est d'avoir dans un repertoire un fichier matrix.txt et un - * fichier par parametre. Si le parametre s'appelle tac, le fichier sera tac.txt - * - * Les fichiers pour les parametres de type double sont de la forme - * <pre> - * -1=0.8 - * 1=1.2 - * </pre> - * - * Les fichiers pour les parametres de type String sont de la forme - * <pre> - * -1=L'equation ecrite sur une seul ligne - * 1=une autre equation toujours sur une ligne - * </pre> - * - * Les fichiers pour les parametres de type Rule sont de la forme - * <pre> --1=Cantonnement -rule.-1.parameter.gear=fr.ifremer.isisfish.entities.Gear\#11690286646709\#0.5814158398678262 -rule.-1.parameter.zone=fr.ifremer.isisfish.entities.Zone\#11690286645767\#0.37798185123822536 -rule.-1.parameter.beginDate=0 -rule.-1.parameter.endDate=119 -rule.-1.parameter.enginSelectivite=false -rule.-1.parameter.beginMonth=8 -rule.-1.parameter.endMonth=11 -1=Cantonnement -rule.1.parameter.gear=fr.ifremer.isisfish.entities.Gear\#11690286646709\#0.5814158398678262 -rule.1.parameter.zone=fr.ifremer.isisfish.entities.Zone\#11690286645767\#0.37798185123822536 -rule.1.parameter.beginDate=0 -rule.1.parameter.endDate=119 -rule.1.parameter.enginSelectivite=false -rule.1.parameter.beginMonth=3 -rule.1.parameter.endMonth=11 - * </pre> - */ -public class Exemple_PlanAnalyse implements AnalysePlan { - - /** to use log facility, just put in your code: log.info("..."); */ - static private Log log = LogFactory.getLog(Exemple_PlanAnalyse.class); - - /// On rentre ici le nom des fichiers � lire c'est � dire ceux contenant la matrice d'exp�rience et - /// pour chaque param�tre les valeurs du param�tres correspondant � chaque modalit� - /// Les param�tres � modifier sont ici les bornes des classes de longueur (growth), la capturabilit�, la selectivit� et les param�tres de l'AMP. - - static private final String MATRIX = "matrix"; /// Le fichier est donc matrix.txt - static private final String VBGF = "growth"; - static private final String SELECTIVITY = "selectivity"; - static private final String CATCHABILITY = "capturabilite"; - static private final String AMP = "amp"; - - /// Ici figure les param�tres du plan qui apparaitront dans l'interface de lancement de simulation et - /// qu on peut �ventuellement modifier avant de lancer le plan : - - public int param_parameterNumber = 4; /// ce param�tre n'est normalement pas modifi� - public int param_first = 0; /// on utilise ce param�tre pour indiquer � quelle ligne - /// de la matrice on doit commencer � faire tourner les simulations au cas o� on ait d� interompre le plan - public int param_simulationNumber = 16;/// ce param�tre n'est normalement pas modifi� - public String param_directory = "Exemple_directory/"; /// Il s'agit du chemin vers le dossier - ///contenant les fichier de matrice et param�tres, par d�faut le repertoire du go.bat - /// donc dans ce cas c'est le dossier Exemple_repertory qui est dans le dossier contenant le go.bat - - - /// D�claration de la matrice d'exp�rience - private MatrixND matrix = null; - - /// Non utilis� pour ce script mais � ne pas effacer - public String [] necessaryResult = { - // put here all necessary result for this rule - // example: - // ResultName.MATRIX_BIOMASS, - // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, - }; - - public String[] getNecessaryResult() { - return this.necessaryResult; - } - - /** - * Permet d'afficher a l'utilisateur une aide sur le plan. - * @return L'aide ou la description du plan - */ - public String getDescription() throws Exception { - return _("r�alise les exp�riences d'un plan complet pour 4 parametres � 2 modalit�s"); - } - - /** - * Appel� au d�marrage de la simulation, cette m�thode permet d'initialiser - * des valeurs - * @param simulation La simulation pour lequel on utilise ce plan - */ - public void init(AnalysePlanContext context) throws Exception { - /// Cr�ation de la matrice d'exp�rience et chargement : - File dir = new File(param_directory); - matrix = MatrixFactory.getInstance().create(new int[]{param_simulationNumber, param_parameterNumber}); - matrix.importCSV(new FileReader(new File(dir, MATRIX + ".txt")), new int[]{0,0}); - matrix.setSemantics(1, Arrays.asList(new String[]{VBGF,CATCHABILITY, SELECTIVITY,AMP})); -System.out.println(matrix); -System.out.println("amp 0 : "+ matrix.getValue(0,AMP)); - /// ajout des regles qui sont modifi�es par le plan - context.getParam().addExtraRules("Cantonnement"); - } - - - /// Cr�ation des m�thodes qui r�ccup�re dans la matrice la modalit� du param�tre pour l'exp�rience en cours - /// Les arguments des m�thodes sont le nom du fichier et le num�ro de la simulation - /// (On d�termine l'exp�rience en cours et donc la ligne de la matrice en sommant le num�ro de la simulation et le param_first) - /// pour un double - /** - * @param name le nom de l'element a recuperer - * @param simulation le numero de la simulation - * @return - */ - private double getDouble(String name, int simulation) throws Exception { - File dir = new File(param_directory); - Properties prop = new Properties(); - prop.load(new BufferedReader(new FileReader(new File(dir, name + ".txt")))); - int ligne = simulation + param_first; - int mod = (int)matrix.getValue(ligne, name); -System.out.println("mod et ligne : "+ mod+" "+ligne); - double result = Double.parseDouble(prop.getProperty(""+mod)); -System.out.println("result : "+ result); - return result; - } - - /// pour une liste de doubles - /** - * @param name le nom de l'element a recuperer - * @param simulation le numero de la simulation - * @return - */ - private double [] getList(String name, int simulation) throws Exception { - File dir = new File(param_directory); - Properties prop = new Properties(); - prop.load(new BufferedReader(new FileReader(new File(dir, name + ".txt")))); - int ligne = simulation + param_first; - int mod = (int)matrix.getValue(ligne, name); - double [] result = StringUtil.toArrayDouble(prop.getProperty(""+mod).split(";")); // ""+ ca construit une chaine de caractere - return result; - } - - /// pour une chaine de characteres (equation) - /** - * @param name le nom de l'element a recuperer - * @param simulation le numero de la simulation - * @return - */ - private String getString(String name, int simulation) throws Exception { - File dir = new File(param_directory); - Properties prop = new Properties(); - prop.load(new BufferedReader(new FileReader(new File(dir, name + ".txt")))); - int ligne = simulation + param_first; - int mod = (int)matrix.getValue(ligne , name); - String result = prop.getProperty(""+mod); - return result; - } - /// pour les param�tres d'une r�gle de gestion - /** - * @param name le nom de l'element a recuperer - * @param simulation le numero de la simulation - * @return - */ - private Rule getRule(RegionStorage regionStorage, String name, int simulation) throws Exception { - File dir = new File(param_directory); - Properties prop = new Properties(); - prop.load(new BufferedReader(new FileReader(new File(dir, name+".txt")))); - int ligne = simulation + param_first; - int mod = (int)matrix.getValue(ligne , name); - String ruleName = prop.getProperty(""+mod); - RuleStorage ruleStorage = RuleStorage.getRule(ruleName); - Rule rule = ruleStorage.getNewRuleInstance(); - RuleHelper.populateRule(mod, regionStorage, rule, prop); - return rule; - } - - - - /** - * Call before each simulation - * @param context plan context - * @param nextSimulation storage used for next simulation - * @return true if we must do next simulation, false to stop plan - * @throws Exception - */ - public boolean beforeSimulation(AnalysePlanContext context, SimulationStorage nextSimulation) throws Exception { - - int simNum = nextSimulation.getParameter().getAnalysePlanNumber()+ param_first; - - if (simNum < param_simulationNumber+1) { /// On v�rifie qu'il reste des exp�riences � faire - - /// On utilise les m�thodes cr�es pour r�cup�rer les valeurs des modalit�s pour l'exp�rience en cours - double [] croissance = getList (VBGF , simNum); - double catchability = getDouble (CATCHABILITY, simNum); - String selectivity = getString (SELECTIVITY, simNum); - Rule amp = getRule(nextSimulation.getStorage(), AMP, simNum); - - /// On peut afficher des informations dans les logs - nextSimulation.getInformation().addInformation("Growth ("+context.getNumber()+")= " + croissance); - nextSimulation.getInformation().addInformation("Selectivity ("+context.getNumber()+")= " + selectivity); - - - /// Il faut maintenant modifier la valeur des param�tres dans la base de donn�es et les param�tres des r�gle de la simulation - /// modif les parametres des regles de gestion : - - // on enleve la regle de la simulation pass� (elle est stoqu�e sous le nom LastAMP) - List<Rule> paramRules = nextSimulation.getParameter().getRules(); - //paramRules.remove(context.getValue("lastAMP")); pas forcement utile - // on nomme la regle que l'on va ajouter LastAMP (pour pouvoir la retrouver a la simulation suivante) - //context.setValue("lastAMP", amp); - // on ajoute la regle � la simulation - paramRules.add(amp); - - /// modif les parametres dans la base de donn�es : - TopiaContext tx = nextSimulation.getStorage().beginTransaction(); - /// On r�cup�re les objets ISIS a modifier dans la base de donn�es - PopulationDAO popDAO = IsisFishDAOHelper.getPopulationDAO(tx); - Population pop = popDAO.findByName("test population"); - List<PopulationGroup> groups = pop.getPopulationGroup(); - GearDAO gearDAO = IsisFishDAOHelper.getGearDAO(tx); - List<Gear> gears = gearDAO.findAll(); - - ///modif borne des classes de taille - /// On remplace les bornes par les �l�ments de la liste - for (PopulationGroup group : groups) { - group.setMinLength(croissance[group.getId()]) ; - group.setMaxLength(croissance[group.getId()+1]) ; - } - - /// modif la capturabilit� - /// On modifie la valeur de la base en la multipliant par la valeur contenue dans la modalit� - MatrixND c = pop.getCapturability(); - for (MatrixIterator i = c.iterator(); i.hasNext();){ - i.next(); - i.setValue(i.getValue()* catchability); - } - - /// modif selectivit� - /// On remplace l'equation existante par une autre equation - for (Gear gear : gears) { - Selectivity sel = gear.getPopulationSelectivity(pop); - Equation eq = sel.getEquation(); - eq.setContent(selectivity); - } - - tx.commitTransaction(); - return true; - } else { - return false; - } - - } - - /** - * Call after each simulation - * @param context plan context - * @param nextSimulation storage used for next simulation - * @return true if we must do next simulation, false to stop plan - * @throws Exception - */ - public boolean afterSimulation(AnalysePlanContext context, SimulationStorage lastSimulation) throws Exception { - return true; - } - -} +package analyseplans; + +import static org.codelutin.i18n.I18n._; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import scripts.ResultName; + +import java.io.*; +import java.io.File; +import java.io.FileReader; +import java.io.Writer; +import java.util.*; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; + +import org.codelutin.math.matrix.*; +import org.codelutin.util.*; +import org.codelutin.topia.*; + +import fr.ifremer.isisfish.*; +import fr.ifremer.isisfish.types.*; +import fr.ifremer.isisfish.rule.Rule; +import fr.ifremer.isisfish.rule.RuleHelper; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.Date; +import fr.ifremer.isisfish.entities.*; +import fr.ifremer.isisfish.simulator.AnalysePlan; +import fr.ifremer.isisfish.simulator.AnalysePlanContext; +import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.datastore.RegionStorage; +import fr.ifremer.isisfish.datastore.RuleStorage; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.datastore.ResultStorage; + +/* + * Exemple_PlanAnalyse.java + * + * Created: 6 juin 2007 + * + * @author sl + * @version $Revision: 3.1.3 $ + * + * Last update: $Date: 2008/12/01 09:29:18 $ + * by : $Author: sl $ + */ + +/** + * Le principe est d'avoir dans un repertoire un fichier matrix.txt et un + * fichier par parametre. Si le parametre s'appelle tac, le fichier sera tac.txt + * + * Les fichiers pour les parametres de type double sont de la forme + * <pre> + * -1=0.8 + * 1=1.2 + * </pre> + * + * Les fichiers pour les parametres de type String sont de la forme + * <pre> + * -1=L'equation ecrite sur une seul ligne + * 1=une autre equation toujours sur une ligne + * </pre> + * + * Les fichiers pour les parametres de type Rule sont de la forme + * <pre> +-1=Cantonnement +rule.-1.parameter.gear=fr.ifremer.isisfish.entities.Gear\#11690286646709\#0.5814158398678262 +rule.-1.parameter.zone=fr.ifremer.isisfish.entities.Zone\#11690286645767\#0.37798185123822536 +rule.-1.parameter.beginDate=0 +rule.-1.parameter.endDate=119 +rule.-1.parameter.enginSelectivite=false +rule.-1.parameter.beginMonth=8 +rule.-1.parameter.endMonth=11 +1=Cantonnement +rule.1.parameter.gear=fr.ifremer.isisfish.entities.Gear\#11690286646709\#0.5814158398678262 +rule.1.parameter.zone=fr.ifremer.isisfish.entities.Zone\#11690286645767\#0.37798185123822536 +rule.1.parameter.beginDate=0 +rule.1.parameter.endDate=119 +rule.1.parameter.enginSelectivite=false +rule.1.parameter.beginMonth=3 +rule.1.parameter.endMonth=11 + * </pre> + */ +public class Exemple_PlanAnalyse implements AnalysePlan { + + /** to use log facility, just put in your code: log.info("..."); */ + static private Log log = LogFactory.getLog(Exemple_PlanAnalyse.class); + + /// On rentre ici le nom des fichiers � lire c'est � dire ceux contenant la matrice d'exp�rience et + /// pour chaque param�tre les valeurs du param�tres correspondant � chaque modalit� + /// Les param�tres � modifier sont ici les bornes des classes de longueur (growth), la capturabilit�, la selectivit� et les param�tres de l'AMP. + + static private final String MATRIX = "matrix"; /// Le fichier est donc matrix.txt + static private final String VBGF = "growth"; + static private final String SELECTIVITY = "selectivity"; + static private final String CATCHABILITY = "capturabilite"; + static private final String AMP = "amp"; + + /// Ici figure les param�tres du plan qui apparaitront dans l'interface de lancement de simulation et + /// qu on peut �ventuellement modifier avant de lancer le plan : + + public int param_parameterNumber = 4; /// ce param�tre n'est normalement pas modifi� + public int param_first = 0; /// on utilise ce param�tre pour indiquer � quelle ligne + /// de la matrice on doit commencer � faire tourner les simulations au cas o� on ait d� interompre le plan + public int param_simulationNumber = 16;/// ce param�tre n'est normalement pas modifi� + public String param_directory = "Exemple_directory/"; /// Il s'agit du chemin vers le dossier + ///contenant les fichier de matrice et param�tres, par d�faut le repertoire du go.bat + /// donc dans ce cas c'est le dossier Exemple_repertory qui est dans le dossier contenant le go.bat + + + /// D�claration de la matrice d'exp�rience + private MatrixND matrix = null; + + /// Non utilis� pour ce script mais � ne pas effacer + public String [] necessaryResult = { + // put here all necessary result for this rule + // example: + // ResultName.MATRIX_BIOMASS, + // ResultName.MATRIX_NET_VALUE_OF_LANDINGS_PER_STRATEGY_MET, + }; + + public String[] getNecessaryResult() { + return this.necessaryResult; + } + + /** + * Permet d'afficher a l'utilisateur une aide sur le plan. + * @return L'aide ou la description du plan + */ + public String getDescription() throws Exception { + return _("r�alise les exp�riences d'un plan complet pour 4 parametres � 2 modalit�s"); + } + + /** + * Appel� au d�marrage de la simulation, cette m�thode permet d'initialiser + * des valeurs + * @param simulation La simulation pour lequel on utilise ce plan + */ + public void init(AnalysePlanContext context) throws Exception { + /// Cr�ation de la matrice d'exp�rience et chargement : + File dir = new File(param_directory); + matrix = MatrixFactory.getInstance().create(new int[]{param_simulationNumber, param_parameterNumber}); + matrix.importCSV(new FileReader(new File(dir, MATRIX + ".txt")), new int[]{0,0}); + matrix.setSemantics(1, Arrays.asList(new String[]{VBGF,CATCHABILITY, SELECTIVITY,AMP})); +System.out.println(matrix); +System.out.println("amp 0 : "+ matrix.getValue(0,AMP)); + /// ajout des regles qui sont modifi�es par le plan + context.getParam().addExtraRules("Cantonnement"); + } + + + /// Cr�ation des m�thodes qui r�ccup�re dans la matrice la modalit� du param�tre pour l'exp�rience en cours + /// Les arguments des m�thodes sont le nom du fichier et le num�ro de la simulation + /// (On d�termine l'exp�rience en cours et donc la ligne de la matrice en sommant le num�ro de la simulation et le param_first) + /// pour un double + /** + * @param name le nom de l'element a recuperer + * @param simulation le numero de la simulation + * @return + */ + private double getDouble(String name, int simulation) throws Exception { + File dir = new File(param_directory); + Properties prop = new Properties(); + prop.load(new BufferedReader(new FileReader(new File(dir, name + ".txt")))); + int ligne = simulation + param_first; + int mod = (int)matrix.getValue(ligne, name); +System.out.println("mod et ligne : "+ mod+" "+ligne); + double result = Double.parseDouble(prop.getProperty(""+mod)); +System.out.println("result : "+ result); + return result; + } + + /// pour une liste de doubles + /** + * @param name le nom de l'element a recuperer + * @param simulation le numero de la simulation + * @return + */ + private double [] getList(String name, int simulation) throws Exception { + File dir = new File(param_directory); + Properties prop = new Properties(); + prop.load(new BufferedReader(new FileReader(new File(dir, name + ".txt")))); + int ligne = simulation + param_first; + int mod = (int)matrix.getValue(ligne, name); + double [] result = StringUtil.toArrayDouble(prop.getProperty(""+mod).split(";")); // ""+ ca construit une chaine de caractere + return result; + } + + /// pour une chaine de characteres (equation) + /** + * @param name le nom de l'element a recuperer + * @param simulation le numero de la simulation + * @return + */ + private String getString(String name, int simulation) throws Exception { + File dir = new File(param_directory); + Properties prop = new Properties(); + prop.load(new BufferedReader(new FileReader(new File(dir, name + ".txt")))); + int ligne = simulation + param_first; + int mod = (int)matrix.getValue(ligne , name); + String result = prop.getProperty(""+mod); + return result; + } + /// pour les param�tres d'une r�gle de gestion + /** + * @param name le nom de l'element a recuperer + * @param simulation le numero de la simulation + * @return + */ + private Rule getRule(RegionStorage regionStorage, String name, int simulation) throws Exception { + File dir = new File(param_directory); + Properties prop = new Properties(); + prop.load(new BufferedReader(new FileReader(new File(dir, name+".txt")))); + int ligne = simulation + param_first; + int mod = (int)matrix.getValue(ligne , name); + String ruleName = prop.getProperty(""+mod); + RuleStorage ruleStorage = RuleStorage.getRule(ruleName); + Rule rule = ruleStorage.getNewRuleInstance(); + RuleHelper.populateRule(mod, regionStorage, rule, prop); + return rule; + } + + + + /** + * Call before each simulation + * @param context plan context + * @param nextSimulation storage used for next simulation + * @return true if we must do next simulation, false to stop plan + * @throws Exception + */ + public boolean beforeSimulation(AnalysePlanContext context, SimulationStorage nextSimulation) throws Exception { + + int simNum = nextSimulation.getParameter().getAnalysePlanNumber()+ param_first; + + if (simNum < param_simulationNumber+1) { /// On v�rifie qu'il reste des exp�riences � faire + + /// On utilise les m�thodes cr�es pour r�cup�rer les valeurs des modalit�s pour l'exp�rience en cours + double [] croissance = getList (VBGF , simNum); + double catchability = getDouble (CATCHABILITY, simNum); + String selectivity = getString (SELECTIVITY, simNum); + Rule amp = getRule(nextSimulation.getStorage(), AMP, simNum); + + /// On peut afficher des informations dans les logs + nextSimulation.getInformation().addInformation("Growth ("+context.getNumber()+")= " + croissance); + nextSimulation.getInformation().addInformation("Selectivity ("+context.getNumber()+")= " + selectivity); + + + /// Il faut maintenant modifier la valeur des param�tres dans la base de donn�es et les param�tres des r�gle de la simulation + /// modif les parametres des regles de gestion : + + // on enleve la regle de la simulation pass� (elle est stoqu�e sous le nom LastAMP) + List<Rule> paramRules = nextSimulation.getParameter().getRules(); + //paramRules.remove(context.getValue("lastAMP")); pas forcement utile + // on nomme la regle que l'on va ajouter LastAMP (pour pouvoir la retrouver a la simulation suivante) + //context.setValue("lastAMP", amp); + // on ajoute la regle � la simulation + paramRules.add(amp); + + /// modif les parametres dans la base de donn�es : + TopiaContext tx = nextSimulation.getStorage().beginTransaction(); + /// On r�cup�re les objets ISIS a modifier dans la base de donn�es + PopulationDAO popDAO = IsisFishDAOHelper.getPopulationDAO(tx); + Population pop = popDAO.findByName("test population"); + List<PopulationGroup> groups = pop.getPopulationGroup(); + GearDAO gearDAO = IsisFishDAOHelper.getGearDAO(tx); + List<Gear> gears = gearDAO.findAll(); + + ///modif borne des classes de taille + /// On remplace les bornes par les �l�ments de la liste + for (PopulationGroup group : groups) { + group.setMinLength(croissance[group.getId()]) ; + group.setMaxLength(croissance[group.getId()+1]) ; + } + + /// modif la capturabilit� + /// On modifie la valeur de la base en la multipliant par la valeur contenue dans la modalit� + MatrixND c = pop.getCapturability(); + for (MatrixIterator i = c.iterator(); i.hasNext();){ + i.next(); + i.setValue(i.getValue()* catchability); + } + + /// modif selectivit� + /// On remplace l'equation existante par une autre equation + for (Gear gear : gears) { + Selectivity sel = gear.getPopulationSelectivity(pop); + Equation eq = sel.getEquation(); + eq.setContent(selectivity); + } + + tx.commitTransaction(); + return true; + } else { + return false; + } + + } + + /** + * Call after each simulation + * @param context plan context + * @param nextSimulation storage used for next simulation + * @return true if we must do next simulation, false to stop plan + * @throws Exception + */ + public boolean afterSimulation(AnalysePlanContext context, SimulationStorage lastSimulation) throws Exception { + return true; + } + +} Modified: branches/4.0.1/src/site/resources/downloads/calibration.java =================================================================== --- branches/4.0.1/src/site/resources/downloads/calibration.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/resources/downloads/calibration.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,453 +19,453 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package analyseplans; -import static org.codelutin.i18n.I18n._; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import scripts.ResultName; -import java.io.*; -import java.util.*; -import org.codelutin.math.matrix.*; -import org.codelutin.topia.*;// pour pouvoir utiliser la methode StringUtil.toDouble() -import org.codelutin.util.*;// pour pouvoir utiliser la methode StringUtil.toDouble() -import fr.ifremer.isisfish.*; -import fr.ifremer.isisfish.types.*; -import fr.ifremer.isisfish.simulator.SimulationContext; -import fr.ifremer.isisfish.types.Date; -import fr.ifremer.isisfish.entities.*; -import fr.ifremer.isisfish.simulator.AnalysePlan; -import fr.ifremer.isisfish.simulator.AnalysePlanContext; -import fr.ifremer.isisfish.simulator.SimulationParameter; -import fr.ifremer.isisfish.datastore.SimulationStorage; -import fr.ifremer.isisfish.datastore.ResultStorage; - -/** - * /////***File must be copied in isis-database-3/ analyseplans/ - * File name : CalibrationEspeceq1q2Export.java - * /////*** File name could be modified if needed - * /////*** BUT class name must be identical to file name (without the extention ".java") see below - * - * Created: 17 septembre 2007 - * - * @author <> - * @version $Revision: 1.27 $ - * - * Last update: $Date: 2007/05/24 09:29:18 $ - * by : $Author: bpoussin $ - */ - - -/////***You can modify class name if you want -/////***BUT attention : file name and class name must be the same (without the extention ".java"), ie here : "CalibrationEspeceq1q2Export" -public class CalibrationEspeceq1q2Export implements AnalysePlan { - - /** to use log facility, just put in your code: log.info("..."); */ - -/////***class name to check here - static private Log log = LogFactory.getLog(CalibrationEspeceq1q2Export.class); - - enum State {STATE_INIT, STATE_0, STATE_1, STATE_2, STATE_3, STATE_4}; - -/////***here must appear the path to export the historic file ("Historic.csv") where q1, q2 and criteria computed at each simulation are written -/////***Attention : before beginning a new calibration rename your eventual old file Historic.csv otherwise it will be lost - File exportHistoric = new File ("C:Documents and Settings/Sigrid/work/ISIS-FISH/Calibration/Historic.csv"); - protected String exportHisto = ""; - - -//initial points of the simplex - public Population param_Population = null; - public String param_M1 = "2.42e-5;2.11e-6";// devient un parametre du plan d analyse - public String param_M2 = "2.34e-5;2.59e-6";// devient un parametre du plan d analyse - public String param_M3 = "2.59e-5;2.41e-6";// devient un parametre du plan d analyse - //public String param_pas = "1e-5";// devient un parametre du plan d analyse -///// ***put here the path and name of the file containing the data on which you calibrate your fichery ( here observed catches) - public String param_nomfichier_debarquements = "Q:/work/ISIS-FISH/Simu/Calibration/Observedlandings2001-2003.csv";//in row : time ; in columns : age or length group - protected File debarquementsObserves; - protected MatrixND matrixDebarquement; - - protected State state = State.STATE_INIT; - public Experiences experiences = new Experiences(); - public String [] necessaryResult = { - ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET - }; - - public String[] getNecessaryResult() { - return this.necessaryResult; - } - - /** - * Permet d'afficher a l'utilisateur une aide sur le plan. - * @return L'aide ou la description du plan - */ - public String getDescription() throws Exception { - return _("Calibration using variable step Simplex method (Walters): user gives a file of observations (here catches) by time step and group (.csv), output will try to approach oservations by changing the values of catchability"); - } - - /** - * Appele au demarrage de la simulation, cette methode permet d'initialiser - * des valeurs - * @param simulation La simulation pour lequel on utilise cette regle - */ - public void init(AnalysePlanContext context) throws Exception { - if (param_nomfichier_debarquements==null || "".equals(param_nomfichier_debarquements)){ - debarquementsObserves = FileUtil.getFile(".*.csv", "fichier csv s�parateur ';'"); - } else { - debarquementsObserves = new File(param_nomfichier_debarquements); - } - int nbYear = context.getParam().getNumberOfYear(); - - TopiaContext db = context.getParam().getRegion().getStorage().beginTransaction(); - Population pop = (Population)db.findByTopiaId(param_Population.getTopiaId()); - - /////*** specify dimention of the matrix containning observations (observed landings for instance) - /////*** numbers of group/columns : could be equal to your number of classes in ISIS but may also be different if your had only aggregated data - int nbGroup = 4 ; -/////*** enter number of observation per year (if you have observation by quarter put 4) / lines of the observations file - int nbTrim = nbYear * 4; - int [] dimMatrix = {nbTrim,nbGroup}; - matrixDebarquement = MatrixFactory.getInstance().create(dimMatrix); -//matrixDebarquement = MatrixFactory.getInstance().create(new int[]{nbGroup}); -// List<PopulationGroup> groups = pop.getPopulationGroup(); -// matrixDebarquement = MatrixFactory.getInstance().create(new List[]{groups}); - matrixDebarquement.importCSV(new FileReader(debarquementsObserves),new int []{0,0}); - log.info("MatrixDebarquement : " + matrixDebarquement); - db.closeContext(); - } - - /** - * Call before each simulation - * @param context plan context - * @param nextSimulation storage used for next simulation - * @return true if we must do next simulation, false to stop plan - * @throws Exception - */ - double g1; - double g2; - double worst1; - double worst2; - - public boolean beforeSimulation(AnalysePlanContext context, SimulationStorage nextSimulation) throws Exception { - boolean doNext = true; - boolean doBoucle = true; -log.info("before simulation"); - - int number = nextSimulation.getParameter().getAnalysePlanNumber(); - -if (number <3) { -log.info("number<3"); - - String [] M1 = param_M1.split(";"); - String [] M2 = param_M2.split(";"); - String [] M3 = param_M3.split(";"); - - double [] q1 = StringUtil.toArrayDouble(M1[0], M2[0], M3[0]); - double [] q2 = StringUtil.toArrayDouble(M1[1], M2[1], M3[1]); - experiences.getExperience(number).q1 = q1[number]; - experiences.getExperience(number).q2 = q2[number]; - - changeDB(experiences.getExperience(number), nextSimulation); - -} else { - - double q1 = 1000; - double q2 = 1000; - double lastCritere = experiences.getExperience(number-1).criteria; - while (doBoucle){ - doBoucle = false; - if (state == State.STATE_INIT) { -doBoucle = false ; -log.info("state init"); - -//ordonne les 3 premieres experiences selon leur critere -Collections.sort(experiences.current); -//log.info("SIMPLEXE : current 0 = " + experiences.current.get(0).criteria + "current 1 = " + experiences.current.get(1).criteria + "current 2 = " + experiences.current.get(2).criteria ); -log.info("SIMPLEXE : current 0 = " + experiences.current.get(0).criteria + "current 1 = " + experiences.current.get(1).criteria + "current 2 = " + experiences.current.get(2).criteria ); -log.info("SIMPLEXE : Best q1 = " + experiences.current.get(0).q1 + " q2 = " + experiences.current.get(0).q2); -log.info("SIMPLEXE : NextBest q1 = " + experiences.current.get(1).q1 + " q2 = " + experiences.current.get(1).q2); -log.info("SIMPLEXE : Worst q1 = " + experiences.current.get(2).q1 + " q2 = " + experiences.current.get(2).q2); - - -//Calcul et evaluation de R -double g1 = (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0; -double g2 = (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0; -double worst1 = experiences.current.get(2).q1; -double worst2 = experiences.current.get(2).q2; - -state = State.STATE_0; - - q1 = 2 * g1 - worst1; - q2 = 2 * g2 - worst2; - -log.info ("R : q1 = " + q1 + " q2 = " + q2 ); - - } else if (state == State.STATE_0) { -doBoucle = false; -log.info("state 0"); - - // on fait la 5eme avec des q qui dependent de la 4eme dans le dernier cas -//log.info("g1 = " + g1 + " " + "g2 = " + g2); -//log.info("worst1 = " + worst1 + " " + "worst2 = " + worst2); - - if (lastCritere > experiences.current.get(2).criteria) { -log.info("State 0 : R : lastCtritere > current2 : R pire de W"); - state = State.STATE_1; - //calcul de Cw - q1 = ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - ( ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - experiences.current.get(2).q1 ) / 2.0; - q2 = ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - ( ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - experiences.current.get(2).q2 ) / 2.0; -log.info("Cw : q1 = " + q1 + " q2 = " + q2); - - - } else if (lastCritere > experiences.current.get(1).criteria) { -log.info("State 0 :R : lastCritere > current 1 : R meilleur que W et moins bon que N"); - state = State.STATE_2; - // calcul de Cr - q1 = ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) + ( ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - experiences.current.get(2).q1 ) / 2.0; - q2 = ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) + ( ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - experiences.current.get(2).q2 ) / 2.0; -log.info("Cr : q1 = " + q1 + " q2 = " + q2); - - } else if (lastCritere > experiences.current.get(0).criteria) { -log.info("State 0 :R : lastCritere > current0 : R meilleur que N et moins bon que B"); - state = State.STATE_INIT; - experiences.current.remove(2);//remove(3)avant - doBoucle = true; -log.info("remove W, simplex BNR"); - - } else { // dernier cas possible: if (lastCritere < experiences.current.get(0).critere) { -log.info("State 0 :R : lastCritere < current 0 : R meilleur que B, calcul de E"); - state = State.STATE_4; - - q1 = experiences.getExperience(number-1).q1 + (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0 - experiences.current.get(2).q1; - q2 = experiences.getExperience(number-1).q2 + (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0 - experiences.current.get(2).q2; - //q1 = experiences.current.get(3).q1 + (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0 - experiences.current.get(2).q1; - //q2 = experiences.current.get(3).q2 + (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0 - experiences.current.get(2).q2; -log.info("E : q1 = " + q1 + " q2 = " + q2); - } - - } else if (state == State.STATE_1) { -log.info("state 1, simplex BNCw"); - experiences.current.remove(3); - experiences.current.remove(2); - state = State.STATE_INIT; - doBoucle = true; - - - } else if (state == State.STATE_2) { -log.info("state 2, simplex BNCr"); - experiences.current.remove(3); - experiences.current.remove(2); - state = State.STATE_INIT; - doBoucle = true; - - - } else if (state == State.STATE_4) { -log.info("state 4 :comparaison de E a B"); - doBoucle = true; - if (lastCritere < experiences.current.get(0).criteria) { -log.info("E meilleur que B, remove 2 et 3 : simplex BNE"); - experiences.current.remove(3); - experiences.current.remove(2); - } else { -log.info("E moins bon que B, remove 2 et 4, simplex BNR"); - experiences.current.remove(4); - experiences.current.remove(2); - } - - state = State.STATE_INIT; - } - - -}//fin du while -//on remplit la table experiences - experiences.getExperience(number).q1 = q1; - experiences.getExperience(number).q2 = q2; - -log.info("on change Q dans la DB avec : q1 = " + q1 + " " + "q2 = " + q2); - -// on change la valeur de q dans la DB - changeDB(experiences.getExperience(number), nextSimulation); - }// fin du else (number > 3) -return doNext; - }// fin du before simulation - - - - /** - - * Call after each simulation, compute criteria for last simulation - * @param context plan context - * @param nextSimulation storage used for next simulation - * @return true if we must do next simulation, false to stop plan - * @throws Exception - */ - - public boolean afterSimulation(AnalysePlanContext context, SimulationStorage lastSimulation) throws Exception { - boolean doNext = true; -log.info("after simulation"); - int number = lastSimulation.getParameter().getAnalysePlanNumber(); - ResultStorage result = lastSimulation.getResultStorage(); - -/////*** Simulated catches are cumulated over strategies, areas and metiers - - MatrixND L2 = result.getMatrix(param_Population, ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); -// log.info("dim de L2" + " " + Arrays.toString(L2.getDim())); -/////*** If some strategies, metiers or areas must not be included in the cumulated catches see below else put "//" at the beginning of line 297 and replace "L2" by "L" at line 289 -/////*** the strategies or so to exclude must be at the begining or end of the list you enter in the parameters interface -/////*** fill the line MatrixND L = L2.getSubMatrix(a,b,c).copy(); as follow : -/////*** a = 1 if you want to exclude strategies, 2 if metiers and 4 if areas -/////*** b = indice of the first object considered -/////*** c = number of object to keep after b, b included - MatrixND L = L2.getSubMatrix(1,2,4).copy(); // for instance : keep strategies 2,3,4,5 -//log.info("sous matrice extraite"); - L = L.sumOverDim(1);// sum over strategies - L = L.sumOverDim(2);// sum over metiers - L = L.sumOverDim(4);// sum over zones -log.info("sommes sur les strategies, metiers et zones faites"); - -/////*** if observations are cumulated by groups else put "//" at the beginning of the following line -L = L.sumOverDim(3); -/////*** else if number of groups in your database differs from number of groups in observations ... write me an e-mail - -////*** if observations are cumulated over quarter a = 3, over year a = 12, else put "//" at the beginning of the following line - L = L.sumOverDim(0,a); - - L = L.reduce(); - - -///////////////////Calcul du critere////////////////// -log.info("calcul du critere"); -log.info("dim de L" + " " + Arrays.toString(L.getDim())); -log.info("dim de obs" + " " + Arrays.toString(matrixDebarquement.getDim())); - double crit = 0; - for ( MatrixIterator g = L.iterator(); g.hasNext();){ - g.next(); -//boucle sur les trimestres et les classes d age - - int [] dim = g.getCoordinates(); - - double obs = matrixDebarquement.getValue(dim); - double simules = g.getValue(); - - crit += Math.pow(obs-simules, 2); // crit = crit + (obs-simules)^2 - }// fin du for -log.info("critere " + number + " = " + crit ); - -//ajoute le critere dans la table experiences - experiences.getExperience(number).criteria = crit; - -//ecriture de la table historic -exportHisto += experiences.getExperience(number).q1 +";"+ experiences.getExperience(number).q2 +";"+ experiences.getExperience(number).criteria + "\n"; -org.codelutin.util.FileUtil.writeString(exportHistoric, exportHisto); - - -return doNext; - -}// fin du after simulation - - /** - * Modify nextSimulation database with q1 and q2 in exp. - * @param exp - * @param nextSimulation - * @throws Exception - */ - - - protected void changeDB(Experience exp, SimulationStorage nextSimulation) throws Exception { -//methode appelee dans before simualtion - TopiaContext db = nextSimulation.getStorage().beginTransaction();//ouvrir un context pour modifier les donnees - Population pop = (Population)db.findByTopiaId(param_Population.getTopiaId()); //reccupere la pop ciblee - MatrixND c = pop.getCapturability(); // reccupere la matrice de capturabilit� - -//log.info("Pour cette simulation : q1 = " + exp.q1 + ";" + "q2 = " + exp.q2 ); - -/////*** that is where you explain how to fill the catchability matrix with q1 and q2 - for (MatrixIterator i = c.iterator(); i.hasNext();){ - i.next(); - Object [] sem = i.getSemanticsCoordinates(); - PopulationGroup group = (PopulationGroup)sem[0]; - PopulationSeasonInfo season = (PopulationSeasonInfo)sem[1]; - -////*** exemple when q2 corresponds to the 12 first groups (groups 0 to 11) - if (group.getId() < 12){ - i.setValue(exp.q2); - }else { - i.setValue(exp.q1); - } - -/////*** exemple when it depends on seasons and groups -/* if (season.getFirstMonth().after(Month.JULY) && group.getId() >=18){ //month >= aout && groupID >= 18 - i.setValue(exp.q2); - }else { - i.setValue(exp.q1); - } -*/ - - }//fin du for - - db.commitTransaction(); // effectue la modification - db.closeContext(); // ferme le context -} - - - - - static public class Experiences { -// cree la liste experiences ou sont stoqu�s q1,q2 et critere pour chaque simulation - - /** contains last simplex and potentialy 2 more simulation */ - public List<Experience> current = new ArrayList<Experience>(); - - /** contains all experience done */ - public List<Experience> history = new ArrayList<Experience>(); - /** - * return experience requested, if this experience doesn't exist - * create it. - * - * @param i simulation number - * @return experience with simulation number fixed if new experience - * is returned - */ - public Experience getExperience(int i) { - Experience result; - if (i<history.size()) { - result = history.get(i); - } else { - result = new Experience(); - result.simNumber = i; - history.add(i, result); - current.add(result); - } - return result; - }//fin de la definition de getExperience - - -/** - * @return the history - */ - public List<Experience> getHistory() { - return this.history; - } - }// fin de la creation des listes experiences - - - - static public class Experience implements Comparable { - public int simNumber; - public double criteria; - public double q1; - public double q2; - /** - * Permit to order experience, first is experience with smallest criteria - */ - public int compareTo(Object arg0) { - Experience other = (Experience)arg0; - int result = Double.compare(this.criteria, other.criteria); - return result; - } - } - - -} \ No newline at end of file +package analyseplans; +import static org.codelutin.i18n.I18n._; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import scripts.ResultName; +import java.io.*; +import java.util.*; +import org.codelutin.math.matrix.*; +import org.codelutin.topia.*;// pour pouvoir utiliser la methode StringUtil.toDouble() +import org.codelutin.util.*;// pour pouvoir utiliser la methode StringUtil.toDouble() +import fr.ifremer.isisfish.*; +import fr.ifremer.isisfish.types.*; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.Date; +import fr.ifremer.isisfish.entities.*; +import fr.ifremer.isisfish.simulator.AnalysePlan; +import fr.ifremer.isisfish.simulator.AnalysePlanContext; +import fr.ifremer.isisfish.simulator.SimulationParameter; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.datastore.ResultStorage; + +/** + * /////***File must be copied in isis-database-3/ analyseplans/ + * File name : CalibrationEspeceq1q2Export.java + * /////*** File name could be modified if needed + * /////*** BUT class name must be identical to file name (without the extention ".java") see below + * + * Created: 17 septembre 2007 + * + * @author <> + * @version $Revision: 1.27 $ + * + * Last update: $Date: 2007/05/24 09:29:18 $ + * by : $Author: bpoussin $ + */ + + +/////***You can modify class name if you want +/////***BUT attention : file name and class name must be the same (without the extention ".java"), ie here : "CalibrationEspeceq1q2Export" +public class CalibrationEspeceq1q2Export implements AnalysePlan { + + /** to use log facility, just put in your code: log.info("..."); */ + +/////***class name to check here + static private Log log = LogFactory.getLog(CalibrationEspeceq1q2Export.class); + + enum State {STATE_INIT, STATE_0, STATE_1, STATE_2, STATE_3, STATE_4}; + +/////***here must appear the path to export the historic file ("Historic.csv") where q1, q2 and criteria computed at each simulation are written +/////***Attention : before beginning a new calibration rename your eventual old file Historic.csv otherwise it will be lost + File exportHistoric = new File ("C:Documents and Settings/Sigrid/work/ISIS-FISH/Calibration/Historic.csv"); + protected String exportHisto = ""; + + +//initial points of the simplex + public Population param_Population = null; + public String param_M1 = "2.42e-5;2.11e-6";// devient un parametre du plan d analyse + public String param_M2 = "2.34e-5;2.59e-6";// devient un parametre du plan d analyse + public String param_M3 = "2.59e-5;2.41e-6";// devient un parametre du plan d analyse + //public String param_pas = "1e-5";// devient un parametre du plan d analyse +///// ***put here the path and name of the file containing the data on which you calibrate your fichery ( here observed catches) + public String param_nomfichier_debarquements = "Q:/work/ISIS-FISH/Simu/Calibration/Observedlandings2001-2003.csv";//in row : time ; in columns : age or length group + protected File debarquementsObserves; + protected MatrixND matrixDebarquement; + + protected State state = State.STATE_INIT; + public Experiences experiences = new Experiences(); + public String [] necessaryResult = { + ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET + }; + + public String[] getNecessaryResult() { + return this.necessaryResult; + } + + /** + * Permet d'afficher a l'utilisateur une aide sur le plan. + * @return L'aide ou la description du plan + */ + public String getDescription() throws Exception { + return _("Calibration using variable step Simplex method (Walters): user gives a file of observations (here catches) by time step and group (.csv), output will try to approach oservations by changing the values of catchability"); + } + + /** + * Appele au demarrage de la simulation, cette methode permet d'initialiser + * des valeurs + * @param simulation La simulation pour lequel on utilise cette regle + */ + public void init(AnalysePlanContext context) throws Exception { + if (param_nomfichier_debarquements==null || "".equals(param_nomfichier_debarquements)){ + debarquementsObserves = FileUtil.getFile(".*.csv", "fichier csv s�parateur ';'"); + } else { + debarquementsObserves = new File(param_nomfichier_debarquements); + } + int nbYear = context.getParam().getNumberOfYear(); + + TopiaContext db = context.getParam().getRegion().getStorage().beginTransaction(); + Population pop = (Population)db.findByTopiaId(param_Population.getTopiaId()); + + /////*** specify dimention of the matrix containning observations (observed landings for instance) + /////*** numbers of group/columns : could be equal to your number of classes in ISIS but may also be different if your had only aggregated data + int nbGroup = 4 ; +/////*** enter number of observation per year (if you have observation by quarter put 4) / lines of the observations file + int nbTrim = nbYear * 4; + int [] dimMatrix = {nbTrim,nbGroup}; + matrixDebarquement = MatrixFactory.getInstance().create(dimMatrix); +//matrixDebarquement = MatrixFactory.getInstance().create(new int[]{nbGroup}); +// List<PopulationGroup> groups = pop.getPopulationGroup(); +// matrixDebarquement = MatrixFactory.getInstance().create(new List[]{groups}); + matrixDebarquement.importCSV(new FileReader(debarquementsObserves),new int []{0,0}); + log.info("MatrixDebarquement : " + matrixDebarquement); + db.closeContext(); + } + + /** + * Call before each simulation + * @param context plan context + * @param nextSimulation storage used for next simulation + * @return true if we must do next simulation, false to stop plan + * @throws Exception + */ + double g1; + double g2; + double worst1; + double worst2; + + public boolean beforeSimulation(AnalysePlanContext context, SimulationStorage nextSimulation) throws Exception { + boolean doNext = true; + boolean doBoucle = true; +log.info("before simulation"); + + int number = nextSimulation.getParameter().getAnalysePlanNumber(); + +if (number <3) { +log.info("number<3"); + + String [] M1 = param_M1.split(";"); + String [] M2 = param_M2.split(";"); + String [] M3 = param_M3.split(";"); + + double [] q1 = StringUtil.toArrayDouble(M1[0], M2[0], M3[0]); + double [] q2 = StringUtil.toArrayDouble(M1[1], M2[1], M3[1]); + experiences.getExperience(number).q1 = q1[number]; + experiences.getExperience(number).q2 = q2[number]; + + changeDB(experiences.getExperience(number), nextSimulation); + +} else { + + double q1 = 1000; + double q2 = 1000; + double lastCritere = experiences.getExperience(number-1).criteria; + while (doBoucle){ + doBoucle = false; + if (state == State.STATE_INIT) { +doBoucle = false ; +log.info("state init"); + +//ordonne les 3 premieres experiences selon leur critere +Collections.sort(experiences.current); +//log.info("SIMPLEXE : current 0 = " + experiences.current.get(0).criteria + "current 1 = " + experiences.current.get(1).criteria + "current 2 = " + experiences.current.get(2).criteria ); +log.info("SIMPLEXE : current 0 = " + experiences.current.get(0).criteria + "current 1 = " + experiences.current.get(1).criteria + "current 2 = " + experiences.current.get(2).criteria ); +log.info("SIMPLEXE : Best q1 = " + experiences.current.get(0).q1 + " q2 = " + experiences.current.get(0).q2); +log.info("SIMPLEXE : NextBest q1 = " + experiences.current.get(1).q1 + " q2 = " + experiences.current.get(1).q2); +log.info("SIMPLEXE : Worst q1 = " + experiences.current.get(2).q1 + " q2 = " + experiences.current.get(2).q2); + + +//Calcul et evaluation de R +double g1 = (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0; +double g2 = (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0; +double worst1 = experiences.current.get(2).q1; +double worst2 = experiences.current.get(2).q2; + +state = State.STATE_0; + + q1 = 2 * g1 - worst1; + q2 = 2 * g2 - worst2; + +log.info ("R : q1 = " + q1 + " q2 = " + q2 ); + + } else if (state == State.STATE_0) { +doBoucle = false; +log.info("state 0"); + + // on fait la 5eme avec des q qui dependent de la 4eme dans le dernier cas +//log.info("g1 = " + g1 + " " + "g2 = " + g2); +//log.info("worst1 = " + worst1 + " " + "worst2 = " + worst2); + + if (lastCritere > experiences.current.get(2).criteria) { +log.info("State 0 : R : lastCtritere > current2 : R pire de W"); + state = State.STATE_1; + //calcul de Cw + q1 = ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - ( ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - experiences.current.get(2).q1 ) / 2.0; + q2 = ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - ( ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - experiences.current.get(2).q2 ) / 2.0; +log.info("Cw : q1 = " + q1 + " q2 = " + q2); + + + } else if (lastCritere > experiences.current.get(1).criteria) { +log.info("State 0 :R : lastCritere > current 1 : R meilleur que W et moins bon que N"); + state = State.STATE_2; + // calcul de Cr + q1 = ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) + ( ((experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0) - experiences.current.get(2).q1 ) / 2.0; + q2 = ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) + ( ((experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0) - experiences.current.get(2).q2 ) / 2.0; +log.info("Cr : q1 = " + q1 + " q2 = " + q2); + + } else if (lastCritere > experiences.current.get(0).criteria) { +log.info("State 0 :R : lastCritere > current0 : R meilleur que N et moins bon que B"); + state = State.STATE_INIT; + experiences.current.remove(2);//remove(3)avant + doBoucle = true; +log.info("remove W, simplex BNR"); + + } else { // dernier cas possible: if (lastCritere < experiences.current.get(0).critere) { +log.info("State 0 :R : lastCritere < current 0 : R meilleur que B, calcul de E"); + state = State.STATE_4; + + q1 = experiences.getExperience(number-1).q1 + (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0 - experiences.current.get(2).q1; + q2 = experiences.getExperience(number-1).q2 + (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0 - experiences.current.get(2).q2; + //q1 = experiences.current.get(3).q1 + (experiences.current.get(0).q1 + experiences.current.get(1).q1) / 2.0 - experiences.current.get(2).q1; + //q2 = experiences.current.get(3).q2 + (experiences.current.get(0).q2 + experiences.current.get(1).q2) / 2.0 - experiences.current.get(2).q2; +log.info("E : q1 = " + q1 + " q2 = " + q2); + } + + } else if (state == State.STATE_1) { +log.info("state 1, simplex BNCw"); + experiences.current.remove(3); + experiences.current.remove(2); + state = State.STATE_INIT; + doBoucle = true; + + + } else if (state == State.STATE_2) { +log.info("state 2, simplex BNCr"); + experiences.current.remove(3); + experiences.current.remove(2); + state = State.STATE_INIT; + doBoucle = true; + + + } else if (state == State.STATE_4) { +log.info("state 4 :comparaison de E a B"); + doBoucle = true; + if (lastCritere < experiences.current.get(0).criteria) { +log.info("E meilleur que B, remove 2 et 3 : simplex BNE"); + experiences.current.remove(3); + experiences.current.remove(2); + } else { +log.info("E moins bon que B, remove 2 et 4, simplex BNR"); + experiences.current.remove(4); + experiences.current.remove(2); + } + + state = State.STATE_INIT; + } + + +}//fin du while +//on remplit la table experiences + experiences.getExperience(number).q1 = q1; + experiences.getExperience(number).q2 = q2; + +log.info("on change Q dans la DB avec : q1 = " + q1 + " " + "q2 = " + q2); + +// on change la valeur de q dans la DB + changeDB(experiences.getExperience(number), nextSimulation); + }// fin du else (number > 3) +return doNext; + }// fin du before simulation + + + + /** + + * Call after each simulation, compute criteria for last simulation + * @param context plan context + * @param nextSimulation storage used for next simulation + * @return true if we must do next simulation, false to stop plan + * @throws Exception + */ + + public boolean afterSimulation(AnalysePlanContext context, SimulationStorage lastSimulation) throws Exception { + boolean doNext = true; +log.info("after simulation"); + int number = lastSimulation.getParameter().getAnalysePlanNumber(); + ResultStorage result = lastSimulation.getResultStorage(); + +/////*** Simulated catches are cumulated over strategies, areas and metiers + + MatrixND L2 = result.getMatrix(param_Population, ResultName.MATRIX_CATCH_WEIGHT_PER_STRATEGY_MET); +// log.info("dim de L2" + " " + Arrays.toString(L2.getDim())); +/////*** If some strategies, metiers or areas must not be included in the cumulated catches see below else put "//" at the beginning of line 297 and replace "L2" by "L" at line 289 +/////*** the strategies or so to exclude must be at the begining or end of the list you enter in the parameters interface +/////*** fill the line MatrixND L = L2.getSubMatrix(a,b,c).copy(); as follow : +/////*** a = 1 if you want to exclude strategies, 2 if metiers and 4 if areas +/////*** b = indice of the first object considered +/////*** c = number of object to keep after b, b included + MatrixND L = L2.getSubMatrix(1,2,4).copy(); // for instance : keep strategies 2,3,4,5 +//log.info("sous matrice extraite"); + L = L.sumOverDim(1);// sum over strategies + L = L.sumOverDim(2);// sum over metiers + L = L.sumOverDim(4);// sum over zones +log.info("sommes sur les strategies, metiers et zones faites"); + +/////*** if observations are cumulated by groups else put "//" at the beginning of the following line +L = L.sumOverDim(3); +/////*** else if number of groups in your database differs from number of groups in observations ... write me an e-mail + +////*** if observations are cumulated over quarter a = 3, over year a = 12, else put "//" at the beginning of the following line + L = L.sumOverDim(0,a); + + L = L.reduce(); + + +///////////////////Calcul du critere////////////////// +log.info("calcul du critere"); +log.info("dim de L" + " " + Arrays.toString(L.getDim())); +log.info("dim de obs" + " " + Arrays.toString(matrixDebarquement.getDim())); + double crit = 0; + for ( MatrixIterator g = L.iterator(); g.hasNext();){ + g.next(); +//boucle sur les trimestres et les classes d age + + int [] dim = g.getCoordinates(); + + double obs = matrixDebarquement.getValue(dim); + double simules = g.getValue(); + + crit += Math.pow(obs-simules, 2); // crit = crit + (obs-simules)^2 + }// fin du for +log.info("critere " + number + " = " + crit ); + +//ajoute le critere dans la table experiences + experiences.getExperience(number).criteria = crit; + +//ecriture de la table historic +exportHisto += experiences.getExperience(number).q1 +";"+ experiences.getExperience(number).q2 +";"+ experiences.getExperience(number).criteria + "\n"; +org.codelutin.util.FileUtil.writeString(exportHistoric, exportHisto); + + +return doNext; + +}// fin du after simulation + + /** + * Modify nextSimulation database with q1 and q2 in exp. + * @param exp + * @param nextSimulation + * @throws Exception + */ + + + protected void changeDB(Experience exp, SimulationStorage nextSimulation) throws Exception { +//methode appelee dans before simualtion + TopiaContext db = nextSimulation.getStorage().beginTransaction();//ouvrir un context pour modifier les donnees + Population pop = (Population)db.findByTopiaId(param_Population.getTopiaId()); //reccupere la pop ciblee + MatrixND c = pop.getCapturability(); // reccupere la matrice de capturabilit� + +//log.info("Pour cette simulation : q1 = " + exp.q1 + ";" + "q2 = " + exp.q2 ); + +/////*** that is where you explain how to fill the catchability matrix with q1 and q2 + for (MatrixIterator i = c.iterator(); i.hasNext();){ + i.next(); + Object [] sem = i.getSemanticsCoordinates(); + PopulationGroup group = (PopulationGroup)sem[0]; + PopulationSeasonInfo season = (PopulationSeasonInfo)sem[1]; + +////*** exemple when q2 corresponds to the 12 first groups (groups 0 to 11) + if (group.getId() < 12){ + i.setValue(exp.q2); + }else { + i.setValue(exp.q1); + } + +/////*** exemple when it depends on seasons and groups +/* if (season.getFirstMonth().after(Month.JULY) && group.getId() >=18){ //month >= aout && groupID >= 18 + i.setValue(exp.q2); + }else { + i.setValue(exp.q1); + } +*/ + + }//fin du for + + db.commitTransaction(); // effectue la modification + db.closeContext(); // ferme le context +} + + + + + static public class Experiences { +// cree la liste experiences ou sont stoqu�s q1,q2 et critere pour chaque simulation + + /** contains last simplex and potentialy 2 more simulation */ + public List<Experience> current = new ArrayList<Experience>(); + + /** contains all experience done */ + public List<Experience> history = new ArrayList<Experience>(); + /** + * return experience requested, if this experience doesn't exist + * create it. + * + * @param i simulation number + * @return experience with simulation number fixed if new experience + * is returned + */ + public Experience getExperience(int i) { + Experience result; + if (i<history.size()) { + result = history.get(i); + } else { + result = new Experience(); + result.simNumber = i; + history.add(i, result); + current.add(result); + } + return result; + }//fin de la definition de getExperience + + +/** + * @return the history + */ + public List<Experience> getHistory() { + return this.history; + } + }// fin de la creation des listes experiences + + + + static public class Experience implements Comparable { + public int simNumber; + public double criteria; + public double q1; + public double q2; + /** + * Permit to order experience, first is experience with smallest criteria + */ + public int compareTo(Object arg0) { + Experience other = (Experience)arg0; + int result = Double.compare(this.criteria, other.criteria); + return result; + } + } + + +} Modified: branches/4.0.1/src/site/rst/contact.rst =================================================================== --- branches/4.0.1/src/site/rst/contact.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/contact.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Contacts/Assistance Modified: branches/4.0.1/src/site/rst/documentation/API.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/API.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/API.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Documentation des APIs @@ -45,4 +45,4 @@ .. _Javadoc Nuiton-Matrix:: http://maven-site.nuiton.org/nuiton-matrix/apidocs/index.html .. _MatrixND:: http://maven-site.nuiton.org/nuiton-matrix/apidocs/org/nuiton/math/matrix/Ma... .. _Javadoc Nuiton-Utils:: http://maven-site.nuiton.org/nuiton-utils/apidocs/index.html -.. _Javadoc Nuiton-j2r:: http://maven-site.nuiton.org/nuiton-j2r/apidocs/index.html \ No newline at end of file +.. _Javadoc Nuiton-j2r:: http://maven-site.nuiton.org/nuiton-j2r/apidocs/index.html Modified: branches/4.0.1/src/site/rst/documentation/FAQ.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/FAQ.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/FAQ.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - FAQ Modified: branches/4.0.1/src/site/rst/documentation/caparmor.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/caparmor.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/caparmor.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Note aux utilisateurs de Caparmor @@ -46,4 +46,4 @@ De plus, Caparmor n'effectuant les simulations qu'une par une dans ce cas, il perd de son utilité. Afin de ne pas perdre de temps, il est grandement conseillé d'utiliser une machine locale pour effectuer les plans de simulations -dépendants. \ No newline at end of file +dépendants. Modified: branches/4.0.1/src/site/rst/documentation/changeVersion.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/changeVersion.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/changeVersion.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Passer de la version 3.1.3 à la version 3.2.0 @@ -122,4 +122,4 @@ - le manuel : http://isis-fish.labs.libre-entreprise.org/wiki-moin/instance/cgi-bin/moin.c... - les changements : -http://isis-fish.labs.libre-entreprise.org/wiki-moin/instance/cgi-bin/moin.c... \ No newline at end of file +http://isis-fish.labs.libre-entreprise.org/wiki-moin/instance/cgi-bin/moin.c... Modified: branches/4.0.1/src/site/rst/documentation/devel/architecture.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/devel/architecture.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/devel/architecture.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ==================== Modified: branches/4.0.1/src/site/rst/documentation/devel/architectureMexico.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/devel/architectureMexico.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/devel/architectureMexico.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ============== Modified: branches/4.0.1/src/site/rst/documentation/devel/rcaparmor.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/devel/rcaparmor.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/devel/rcaparmor.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ .. * $Id$ .. * $HeadURL$ .. * %% -.. * Copyright (C) 2012 CodeLutin, Chatellier Eric +.. * Copyright (C) 2012 Ifremer, CodeLutin, Chatellier Eric .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Utilisation de R sur caparmor Modified: branches/4.0.1/src/site/rst/documentation/devel.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/devel.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/devel.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Documentation développeur Modified: branches/4.0.1/src/site/rst/documentation/history/changelog.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/history/changelog.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/history/changelog.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Liste des changements apportés à Isis-Fish (Version 3) Modified: branches/4.0.1/src/site/rst/documentation/history/history.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/history/history.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/history/history.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Historique du projet ISIS-Fish Modified: branches/4.0.1/src/site/rst/documentation/installation.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/installation.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/installation.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Installation et lancement d'ISIS-Fish Modified: branches/4.0.1/src/site/rst/documentation/isisFishModel.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/isisFishModel.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/isisFishModel.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Le modèle de données Copied: branches/4.0.1/src/site/rst/documentation/isisscript.tex (from rev 3799, trunk/src/site/rst/documentation/isisscript.tex) =================================================================== --- branches/4.0.1/src/site/rst/documentation/isisscript.tex (rev 0) +++ branches/4.0.1/src/site/rst/documentation/isisscript.tex 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,215 @@ +\documentclass[pdf,13pt]{beamer} +\usepackage[utf8]{inputenc} +\usepackage[T1]{fontenc} +\usepackage[francais]{babel} % francais +\usepackage{graphicx} % images +\usepackage{times} +\usepackage{listings} +\usepackage{color} + +% Theme beamer and color +% JuanLesPins Malmoe PaloAlto Berlin Boadilla Copenhagen Hannover Goettingen +% Montpellier Rochester Madrid Antibes Singapore Szeged Warsaw +% Ilmenau Luebeck Dresden Frankfurt* Darmstadt* +\usetheme{Frankfurt} +% albatross,beetle,crane,default,dove,fly,lily,orchid,rose,seagull +% seahorse,whale,dolphin +%\usecolortheme{sidebartab} +%\setbeamertemplate{navigation symbols}{} % supprime la navigation +\usefonttheme[onlylarge]{structurebold} +\setbeamerfont*{frametitle}{size=\normalsize,series=\bfseries} +\setbeamertemplate{navigation symbols}{} + +% Types d'images utilisees +\DeclareGraphicsExtensions{.png, .eps, .jpg} + +% Ajout du logo Code Lutin en fond +\setbeamertemplate{background}{% + \parbox[c][\paperheight]{\paperwidth}{% + \vfill + \vfill + \hfill + \includegraphics[width=0.23\paperwidth,height=0.1\paperheight]{isislogo} + \hfill +}} + + +% ######################### Document Infos ##################################### +% Infos de la page de presentation +\title{ISIS-Fish} +\subtitle{Scripts} +\author{CHATELLIER Eric + \and{} + POUSSIN Benjamin} +\institute{ + Ifremer + \and{} + Code Lutin +} +\date{6 décembre 2011} + +% ############################################################################## +\begin{document} + +\begin{frame} +\titlepage +\end{frame} + +\begin{frame} +\frametitle{Plan} +\tableofcontents +\end{frame} + +% ############################################################################## +\section{Fonctionnement} + +\subsection{Qu'est-ce qu'un script ?} +\begin{frame} +\frametitle{Qu'est-ce qu'un script ?} + + \begin{itemize} + \item Code de production de simulation + \item Code d'execution de simulation + \item Écrit en Java + \item Modifiable par l'utilisateur + \end{itemize} + +\end{frame} + +\subsection{Simulateur} +\begin{frame} +\frametitle{Simulateur} + + \begin{block}{DefaultSimulator.java} + \begin{itemize} + \item Effectifs initiaux + \item Opérations par pas de temps (mois) + \item Application de la dynamique de pêcherie (pêche, mortalité...) + \item Enregistrement des résultats + \end{itemize} + \end{block} + + \begin{block}{Modification} + \begin{itemize} + \item SimulatorEffortByCell + \item Autres scripts... + \end{itemize} + \end{block} +\end{frame} + +\subsection{Scripts} +\begin{frame} +\frametitle{Scripts} + \begin{block}{Avant la simulation} + \begin{itemize} + \item Plan de simulations + \begin{itemize} + \item Plan d'expérience + \item Calibration + \end{itemize} + \item Plan d'analyzes + \begin{itemize} + \item Expand Grid + \item Moriss + \item Sobol + \end{itemize} + \end{itemize} + \end{block} +\end{frame} + +\begin{frame} +\frametitle{Scripts} + \begin{block}{Pendant la simulation} + \begin{itemize} + \item Règles (chaque pas de temps) + \begin{itemize} + \item Fermeture de zone + \item Application de quotat + \item Taille minimum des poissons + \item ... + \end{itemize} + \end{itemize} + \end{block} +\end{frame} + +\begin{frame} +\frametitle{Scripts} + \begin{block}{Après la simulation} + \begin{itemize} + \item Exports + \begin{itemize} + \item Biomasse + \item Abondance + \item Capture + \item Rejet + \end{itemize} + \end{itemize} + \end{block} +\end{frame} + +\begin{frame} +\frametitle{Scripts} + \begin{block}{Scripts importants} + \begin{itemize} + \item ResultName (nom des résultats) + \item SiMatrix (calcul des matrices) + \item GravityModel (calcul des matrices aussi) + \end{itemize} + \end{block} +\end{frame} + +% ############################################################################## +\section{Utilisation et modification} + +\subsection{Utilisation} +\begin{frame} +\frametitle{Utilisation des scripts} + + \begin{itemize} + \item Ajout dans l'interface + \item Définition des parametres (param\_) + \item Lancement de la simulation + \end{itemize} + +\end{frame} + +\subsection{Modification} +\begin{frame} +\frametitle{Modification des scripts} + + \begin{block}{Interface et dépôt} + \begin{itemize} + \item Interface de gestion des scripts + \item Dépôt officiel + \item Dépôt communauté + \end{itemize} + \end{block} + + \begin{block}{Dépôt communauté} + \begin{itemize} + \item Creation d'un nouvelle règle + \item Modification de la régle + \item Vérification de la règle + \item Utilisation de la règle + \end{itemize} + \end{block} + +\end{frame} + + +% ############################################################################## +\section{Contribution} + +\subsection{Contribution} +\begin{frame} + \frametitle{Contribution} + + \begin{itemize} + \item Partage de scripts utilisateur + \item Droit de commit + \item Synchronisation de la communauté + \end{itemize} + +\end{frame} + +\end{document} Modified: branches/4.0.1/src/site/rst/documentation/scripts.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/scripts.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/scripts.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Page de dépôt de scripts Modified: branches/4.0.1/src/site/rst/documentation/scriptsR.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/scriptsR.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/scriptsR.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Exemple de scripts R Modified: branches/4.0.1/src/site/rst/documentation/tutorials/analysisPlan.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/tutorials/analysisPlan.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/tutorials/analysisPlan.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Tutoriaux pour l'utilisation des plans d'analyse Modified: branches/4.0.1/src/site/rst/documentation/tutorials/firstLaunch.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/tutorials/firstLaunch.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/tutorials/firstLaunch.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Tutoriel : Utilisation d'ISIS-Fish (V3.2.0) pas à pas Modified: branches/4.0.1/src/site/rst/documentation/tutorials/parameterising.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/tutorials/parameterising.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/tutorials/parameterising.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Paramétrisation d'une pêcherie (Isis-3.1.3) @@ -36,4 +36,4 @@ .. _Telecharger l exemple en PDF:: ../../downloads/ExempleParametrisation.pdf -.. _Telecharger la base zippee:: ../../downloads/Testparam.zip \ No newline at end of file +.. _Telecharger la base zippee:: ../../downloads/Testparam.zip Modified: branches/4.0.1/src/site/rst/documentation/tutorials/useAPI.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/tutorials/useAPI.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/tutorials/useAPI.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Tuto d'utilisation des API Modified: branches/4.0.1/src/site/rst/documentation/tutorials/utilCaparmor.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/tutorials/utilCaparmor.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/tutorials/utilCaparmor.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Quelques commande utiles sur CAPARMOR (ou un autre supercalculateur) @@ -54,4 +54,4 @@ Commandes Unix -------------- Une page web bien utile pour les commandes Unix en general : -http://www.infres.enst.fr/~danzart/unix_abrege.html#exemples \ No newline at end of file +http://www.infres.enst.fr/~danzart/unix_abrege.html#exemples Modified: branches/4.0.1/src/site/rst/documentation/tutorials.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/tutorials.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/tutorials.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Liste des tutoriels Modified: branches/4.0.1/src/site/rst/documentation/userManual/GUI.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual/GUI.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual/GUI.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ======================= @@ -205,4 +205,4 @@ Lors du lancement de l'analyse de sensibilité, automatiquement la date courante sera ajouté au nom de l'analyse. Le nom de chaque simulation est terminée par _ -suivi du numéro de la simulation dans l'analyse de sensibilité. \ No newline at end of file +suivi du numéro de la simulation dans l'analyse de sensibilité. Modified: branches/4.0.1/src/site/rst/documentation/userManual/analysisPlan.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual/analysisPlan.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual/analysisPlan.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ============== Modified: branches/4.0.1/src/site/rst/documentation/userManual/inputs.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual/inputs.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual/inputs.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ===================== @@ -1554,4 +1554,4 @@ #. **Sauver** : Pour sauvegarder les modifications effectués sur cet écran. #. **Annuler** : - Pour annuler les modifications effectués sur cet écran. \ No newline at end of file + Pour annuler les modifications effectués sur cet écran. Modified: branches/4.0.1/src/site/rst/documentation/userManual/introduction.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual/introduction.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual/introduction.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Introduction @@ -129,4 +129,4 @@ population, chaque activité de pêche et chaque mesure de gestion. Au sein de chaque zone et pour chaque saison, l'effort de pêche d'une activité particulière, ou l'abondance d'une population, sont supposées -homogènes et uniformément distribuées. \ No newline at end of file +homogènes et uniformément distribuées. Modified: branches/4.0.1/src/site/rst/documentation/userManual/launcher.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual/launcher.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual/launcher.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ====================== @@ -328,4 +328,4 @@ TODO Après cette description détaillé de tout la configuration, un petit tuto pour -réaliser ''en trois clics'' une simulation. \ No newline at end of file +réaliser ''en trois clics'' une simulation. Modified: branches/4.0.1/src/site/rst/documentation/userManual/queue.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual/queue.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual/queue.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - =================== @@ -95,4 +95,4 @@ courriel. #. **corps du message** : corps du courriel à envoyer. #. **envoyer** : pour envoyer le courriel. -#. **annuler** : pour annuler l'envoie de courriel et revenir à la console de log. \ No newline at end of file +#. **annuler** : pour annuler l'envoie de courriel et revenir à la console de log. Modified: branches/4.0.1/src/site/rst/documentation/userManual/results.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual/results.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual/results.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - =================== @@ -106,4 +106,4 @@ #. il est possible d'exporter ces données sous la forme d'un fichier au format CSV. Un dialogue vous demandera d'indiquer le chemin où sauvegarder le fichier. - \ No newline at end of file + Modified: branches/4.0.1/src/site/rst/documentation/userManual/scripts.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual/scripts.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual/scripts.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ======================= @@ -298,4 +298,4 @@ .. image:: script_11_verifSyntax_ko.png -après une vérification qui a échoué \ No newline at end of file +après une vérification qui a échoué Modified: branches/4.0.1/src/site/rst/documentation/userManual/sensitivity.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual/sensitivity.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual/sensitivity.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ====================================== @@ -662,4 +662,4 @@ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! N'oubliez pas que vous pouvez obtenir tous les objets de la session R en -utilisant la fonction ls() dans R. \ No newline at end of file +utilisant la fonction ls() dans R. Modified: branches/4.0.1/src/site/rst/documentation/userManual.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/userManual.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/userManual.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Documentation utilisateur @@ -46,4 +46,4 @@ .. _Editeur de script:: userManual/scripts.html .. _Queue de simulation:: userManual/queue.html .. _Plan d experience-Plan d analyse:: userManual/analysisPlan.html -.. _Analyses de sensibilite:: ../downloads/manuel_sensitivity.pdf \ No newline at end of file +.. _Analyses de sensibilite:: ../downloads/manuel_sensitivity.pdf Modified: branches/4.0.1/src/site/rst/documentation/warning.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation/warning.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation/warning.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Attention Modified: branches/4.0.1/src/site/rst/documentation.rst =================================================================== --- branches/4.0.1/src/site/rst/documentation.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/documentation.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Documentation d'ISIS-Fish Modified: branches/4.0.1/src/site/rst/download.rst =================================================================== --- branches/4.0.1/src/site/rst/download.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/download.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ===================== Modified: branches/4.0.1/src/site/rst/history.rst =================================================================== --- branches/4.0.1/src/site/rst/history.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/history.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Historique @@ -38,4 +38,4 @@ * `Version 1 <v1/changelog.html>`_ * `Version 2 <v2/index.html>`_ - \ No newline at end of file + Modified: branches/4.0.1/src/site/rst/index.rst =================================================================== --- branches/4.0.1/src/site/rst/index.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/index.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ========= Modified: branches/4.0.1/src/site/rst/license.rst =================================================================== --- branches/4.0.1/src/site/rst/license.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/license.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Licence du projet Modified: branches/4.0.1/src/site/rst/listStats.rst =================================================================== --- branches/4.0.1/src/site/rst/listStats.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/listStats.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Statistiques des listes de diffusion @@ -101,4 +101,4 @@ * 2008: 2479 * 2009: 4348 -Total : 12009 \ No newline at end of file +Total : 12009 Modified: branches/4.0.1/src/site/rst/news.rst =================================================================== --- branches/4.0.1/src/site/rst/news.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/news.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ========================================= @@ -63,4 +63,4 @@ .. _Atelier franco-australien - modeles bio-economiques::http://www.umr-amure.fr/pg_workshop_fast.php .. _Conference annuelle du CIEM - Halifax::http://www.ices.dk/iceswork/asc/2008/index.asp .. _Groupe de travail CIEM::http://www.ices.dk/workinggroups/ViewWorkingGroup.aspx?ID=345 -.. _Mexico::http://www.avignon.inra.fr/mexico/index.php/Accueil \ No newline at end of file +.. _Mexico::http://www.avignon.inra.fr/mexico/index.php/Accueil Modified: branches/4.0.1/src/site/rst/othertools.rst =================================================================== --- branches/4.0.1/src/site/rst/othertools.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/othertools.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Autres utilitaires @@ -35,4 +35,4 @@ éditer les fichiers et plus particulièrement programmer en java + `Utilisation-Installation de Netbeans <tools/netbeans.html`_ - \ No newline at end of file + Modified: branches/4.0.1/src/site/rst/presentation.rst =================================================================== --- branches/4.0.1/src/site/rst/presentation.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/presentation.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ISIS-Fish @@ -50,4 +50,4 @@ * Irin (Institut de Recherche en Informatique de Nantes) * Cogitec ( http://www.cogitec.fr ) - * Code Lutin ( http://www.codelutin.com ) \ No newline at end of file + * Code Lutin ( http://www.codelutin.com ) Modified: branches/4.0.1/src/site/rst/publication.rst =================================================================== --- branches/4.0.1/src/site/rst/publication.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/publication.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Publications Modified: branches/4.0.1/src/site/rst/research.rst =================================================================== --- branches/4.0.1/src/site/rst/research.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/research.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Projets de recherche liés à ISIS-Fish Modified: branches/4.0.1/src/site/rst/tools/eclipse.rst =================================================================== --- branches/4.0.1/src/site/rst/tools/eclipse.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/tools/eclipse.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ============================================================== @@ -116,4 +116,4 @@ Maintenant cliqué sur Debug en bas de la fenêtre, Eclipse doit se connecter à Isis. Il vous faut maintenant poser des points d'arret dans votre code pour qu'Eclipse arrete l'execution et que vous puissiez faire du pas a pas à -partir de ces lignes. \ No newline at end of file +partir de ces lignes. Modified: branches/4.0.1/src/site/rst/tools/netbeans.rst =================================================================== --- branches/4.0.1/src/site/rst/tools/netbeans.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/tools/netbeans.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Comment débugger avec NetBeans ? Modified: branches/4.0.1/src/site/rst/v1/changelog.rst =================================================================== --- branches/4.0.1/src/site/rst/v1/changelog.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v1/changelog.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Version 1 Modified: branches/4.0.1/src/site/rst/v2/changelog.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/changelog.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/changelog.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ver-2.3.2 (20060727) Modified: branches/4.0.1/src/site/rst/v2/devel/index.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/devel/index.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/devel/index.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Documentation développeur Modified: branches/4.0.1/src/site/rst/v2/index.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/index.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/index.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Version 2 @@ -239,4 +239,4 @@ * dans le tableau de population les longueurs min et max sont affichées si les classes sont en longueur * correction d'une erreur lors de la creation de la matrice de changement de classe pour une population en longueur n'ayant qu'un secteur de pop * amelioration du fichier java web start pour permettre d'avoir l'aide avec le javahelp - * amelioration du jar standalone pour avoir l'aide dedans \ No newline at end of file + * amelioration du jar standalone pour avoir l'aide dedans Modified: branches/4.0.1/src/site/rst/v2/user/ECMAScript.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/user/ECMAScript.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/user/ECMAScript.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ========== Modified: branches/4.0.1/src/site/rst/v2/user/ECMAScriptEdit.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/user/ECMAScriptEdit.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/user/ECMAScriptEdit.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ============== Modified: branches/4.0.1/src/site/rst/v2/user/FAQ.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/user/FAQ.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/user/FAQ.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - =================== Modified: branches/4.0.1/src/site/rst/v2/user/Rules.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/user/Rules.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/user/Rules.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ===================== Modified: branches/4.0.1/src/site/rst/v2/user/ScriptHilaire.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/user/ScriptHilaire.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/user/ScriptHilaire.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ======================= Modified: branches/4.0.1/src/site/rst/v2/user/SimulationLauncher.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/user/SimulationLauncher.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/user/SimulationLauncher.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ================== Modified: branches/4.0.1/src/site/rst/v2/user/index.rst =================================================================== --- branches/4.0.1/src/site/rst/v2/user/index.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v2/user/index.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Documentation utilisateur Modified: branches/4.0.1/src/site/rst/v3/changelog.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/changelog.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/changelog.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ver-3.0.22 poussin 200711?? Modified: branches/4.0.1/src/site/rst/v3/devel/SyntaxeOption.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/devel/SyntaxeOption.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/devel/SyntaxeOption.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Syntaxe des arguments d'une option @@ -240,4 +240,4 @@ listSimulation(--listSimulation, -l) list all simulation available localy resetConfig(--resetConfig) Reset user configuration ui(--ui) not launch user interface [true|false] -ssh-key-file(--ssh-key-file, -k) change private ssh key file path \ No newline at end of file +ssh-key-file(--ssh-key-file, -k) change private ssh key file path Modified: branches/4.0.1/src/site/rst/v3/devel/index.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/devel/index.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/devel/index.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Documentation développeur Modified: branches/4.0.1/src/site/rst/v3/devel/isis-architecture.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/devel/isis-architecture.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/devel/isis-architecture.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ==================== Modified: branches/4.0.1/src/site/rst/v3/devel/usbkey.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/devel/usbkey.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/devel/usbkey.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Installation d'Isis sur clé USB @@ -53,4 +53,4 @@ vcs.protocol=svn vcs.username=anonymous compilation.directory=isis-build - monitoring.directory=isis-monitoring \ No newline at end of file + monitoring.directory=isis-monitoring Modified: branches/4.0.1/src/site/rst/v3/user/AnalysePlan.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/AnalysePlan.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/AnalysePlan.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ============== Modified: branches/4.0.1/src/site/rst/v3/user/ExternalScriptEditor.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/ExternalScriptEditor.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/ExternalScriptEditor.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ==================================================== Modified: branches/4.0.1/src/site/rst/v3/user/FAQ.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/FAQ.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/FAQ.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - =================== Modified: branches/4.0.1/src/site/rst/v3/user/Historique.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/Historique.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/Historique.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Historique du projet ISIS-Fish Modified: branches/4.0.1/src/site/rst/v3/user/Installation.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/Installation.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/Installation.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Installion et lancementd'ISIS-Fish Modified: branches/4.0.1/src/site/rst/v3/user/Introduction.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/Introduction.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/Introduction.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Introduction Modified: branches/4.0.1/src/site/rst/v3/user/LaunchOption.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/LaunchOption.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/LaunchOption.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Option de lancement Modified: branches/4.0.1/src/site/rst/v3/user/UserInterface.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/UserInterface.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/UserInterface.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ======================= Modified: branches/4.0.1/src/site/rst/v3/user/addSshKey.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/addSshKey.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/addSshKey.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - =============================== Modified: branches/4.0.1/src/site/rst/v3/user/index.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/index.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/index.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - Documentation utilisateur Modified: branches/4.0.1/src/site/rst/v3/user/inputs.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/inputs.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/inputs.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ==================== Modified: branches/4.0.1/src/site/rst/v3/user/isisFishData.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/isisFishData.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/isisFishData.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ============================== Modified: branches/4.0.1/src/site/rst/v3/user/result.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/result.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/result.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - =================== Modified: branches/4.0.1/src/site/rst/v3/user/scripts.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/scripts.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/scripts.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ======================= Modified: branches/4.0.1/src/site/rst/v3/user/simulations.rst =================================================================== --- branches/4.0.1/src/site/rst/v3/user/simulations.rst 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/rst/v3/user/simulations.rst 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ .. * %% .. * This program is free software: you can redistribute it and/or modify .. * it under the terms of the GNU General Public License as -.. * published by the Free Software Foundation, either version 2 of the +.. * published by the Free Software Foundation, either version 3 of the .. * License, or (at your option) any later version. .. * .. * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ .. * .. * You should have received a copy of the GNU General Public .. * License along with this program. If not, see -.. * <http://www.gnu.org/licenses/gpl-2.0.html>. +.. * <http://www.gnu.org/licenses/gpl-3.0.html>. .. * #L% .. - ====================== Modified: branches/4.0.1/src/site/site_en.xml =================================================================== --- branches/4.0.1/src/site/site_en.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/site_en.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -10,7 +10,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/site/site_fr.xml =================================================================== --- branches/4.0.1/src/site/site_fr.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/site/site_fr.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -10,7 +10,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/AbstractIsisFishTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -40,6 +40,7 @@ import freemarker.cache.ClassTemplateLoader; import freemarker.ext.beans.BeansWrapper; import freemarker.template.Configuration; +import java.io.IOException; /** * Abstract test case for isis fish. Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisConfigTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/IsisFishMiscTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/AutoMigrationIsisH2Config.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/AutoMigrationIsisH2Config.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/AutoMigrationIsisH2Config.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/DataStorageTestHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ExportStorageTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/FormuleStorageTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/RuleStorageTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/ScriptStorageTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityAnalysisStorageTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SensitivityExportStorageTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationInformationTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulationPlanStorageTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/SimulatorStorageTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/datastore/migration/AutoDatabaseMigrationClass.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceConventionTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PersistenceTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/PopulationSeasonInfoTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -3,11 +3,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 Codelutin, Chatellier Eric + * Copyright (C) 2010 - 2012 Ifremer, Codelutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/LoggerHelper.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/SimulationLoggerUtilTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/logging/io/LineReaderUtilTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -242,4 +242,4 @@ reader.close(); } -} \ No newline at end of file +} Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/MexicoHelperTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/mexico/export/RegionExplorerTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/rule/RuleMock.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -5,11 +5,11 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 CodeLutin, Chatellier Eric + * Copyright (C) 2010 - 2012 Ifremer, CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationParameterTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationMonitorTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceIT.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SimulationServiceTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/launcher/SshSimulatorLauncherTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -329,4 +329,20 @@ Assert.assertTrue(content.contains("${R_HOME}/lib")); } -} \ No newline at end of file + + /** + * Test que memoire définie dans la configuration est bien présente. + * + * @throws IOException + * @throws TemplateException + */ + @Test + public void testFreemarkerTemplateMemory() throws IOException, TemplateException { + SSHSimulatorLauncher launcher = new SSHSimulatorLauncher(); + String content = launcher.getSimulationScriptLaunchContent( + SSHSimulatorLauncher.QSUB_SCRIPT_TEMPLATE, "", + "", true, "", "", true); + + Assert.assertTrue(content.contains("Xmx2000M")); + } +} Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/FactorTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisRandomMock.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisRandomMock.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityAnalysisRandomMock.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/SensitivityUtilsTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -7,7 +7,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,7 +17,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/group/FactorGroupTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/group/FactorGroupTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/simulator/sensitivity/group/FactorGroupTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/types/MonthTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/sensitivity/FactorTreeModelTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/util/ErrorHelperTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/FormInterval.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/IntervalPanelTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/IntervalPanelTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/IntervalPanelTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/ui/widget/filter/FilterDialogModelMock.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Copied: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/BitUtilTest.java (from rev 3799, trunk/src/test/java/fr/ifremer/isisfish/util/BitUtilTest.java) =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/BitUtilTest.java (rev 0) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/BitUtilTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,54 @@ +/* + * #%L + * IsisFish + * + * $Id: BitUtil.java 3671 2012-04-03 13:31:36Z echatellier $ + * $HeadURL$ + * %% + * Copyright (C) 2012 Ifremer, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import org.junit.Assert; +import org.junit.Test; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class BitUtilTest { + + /** + * Test que la conversion chaine vers long fonctionne pour la creation de mark + */ + @Test + public void testMark() { + String s = "res mat"; + long l = BitUtil.toMark(s); + String r = BitUtil.fromMark(l); + + // le resultat fait toujours 8 caracteres, s'il faut des espaces son ajouter + Assert.assertEquals(s + " ", r); + } + +} Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/CompileHelperTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -27,19 +27,17 @@ import java.io.File; import java.io.IOException; -import java.lang.reflect.Method; import java.net.URL; import java.net.URLClassLoader; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.util.FileUtil; import org.junit.Assert; import org.junit.Test; +import org.nuiton.util.FileUtil; import fr.ifremer.isisfish.AbstractIsisFishTest; import fr.ifremer.isisfish.equation.PopulationReproductionEquation; @@ -183,64 +181,7 @@ fB.delete(); FileUtil.deleteRecursively(dest); } - - /* - * Save a file as non utf-8 encoded. - * Convert to uft-8. - * Assert that file has been converted. - * @throws IOException - * - @Test - public void convertToUnicodeTest() throws IOException { - String content = getFirstClassContent("ConvertToUnicode"); - // add un accent - content = content.replace("code", "cod\u00E9"); - - File nonUnicodeFile = File.createTempFile("ConvertToUnicode", ".java", getTestDirectory()); - FileUtil.writeString(nonUnicodeFile, content, "ISO-8859-15"); - - if (log.isDebugEnabled()) { - log.debug("Saved file " + nonUnicodeFile.getAbsolutePath() + " as ISO-8859-15"); - } - - CompileHelper.convertToUnicode(Collections.singletonList(nonUnicodeFile)); - - // don't support encoding String newContent = FileUtil.readAsString(nonUnicodeFile); - String newContent = FileUtils.readFileToString(nonUnicodeFile, "UTF-8"); - Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); - - nonUnicodeFile.delete(); - }*/ - - /* - * Try to convert file already in UTF-8. - * - * @throws IOException - * - @Test - public void convertToUnicodeUselessTest() throws IOException { - String content = getFirstClassContent("UselessConvertToUnicode"); - - // add un accent - content = content.replace("code", "cod\u00E9"); - - File nonUnicodeFile = File.createTempFile("UselessConvertToUnicode", ".java", getTestDirectory()); - FileUtil.writeString(nonUnicodeFile, content, "UTF-8"); - - if (log.isDebugEnabled()) { - log.debug("Saved file " + nonUnicodeFile.getAbsolutePath() + " as UTF-8"); - } - - CompileHelper.convertToUnicode(Collections.singletonList(nonUnicodeFile)); - - // don't support encoding String newContent = FileUtil.readAsString(nonUnicodeFile); - String newContent = FileUtils.readFileToString(nonUnicodeFile, "UTF-8"); - Assert.assertTrue(newContent.indexOf("cod\u00E9") > 0); - - nonUnicodeFile.delete(); - }*/ - /** * Test que le contenu du fichier java correspondant à l'equation est * corectement généré. Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/EvaluateHelperTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Copied: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java (from rev 3799, trunk/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java) =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java (rev 0) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/IsisMatrixSemanticMapperTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -0,0 +1,180 @@ +/* + * #%L + * IsisFish + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 Ifremer, Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +package fr.ifremer.isisfish.util; + +import java.io.File; +import java.io.IOException; +import java.io.StringReader; +import java.net.URL; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +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.AbstractIsisFishTest; +import fr.ifremer.isisfish.IsisFishDAOHelper; +import fr.ifremer.isisfish.datastore.SimulationStorage; +import fr.ifremer.isisfish.entities.Population; +import fr.ifremer.isisfish.simulator.SimulationContext; +import fr.ifremer.isisfish.types.TimeStep; + +/** + * Test que le semantic mapper est bien pris en compte lors de l'import + * de matrix nd et qu'il converti bien tous les types requis. + * + * @author echatellier + * @since 4.1.0.3 + */ +public class IsisMatrixSemanticMapperTest extends AbstractIsisFishTest { + + @Before + public void setUp() throws IOException, TopiaException { + MatrixFactory.setSemanticMapper(new IsisMatrixSemanticMapper()); + URL zipURL = this.getClass().getResource("/simulations/test-nonregression-20090203.zip"); + SimulationStorage simRef = SimulationStorage.importAndRenameZip(new File(zipURL.getFile()), "test-" + System.currentTimeMillis()); + SimulationContext.get().setSimulationStorage(simRef); + } + + @After + public void clearThreadLocal() { + SimulationContext.remove(); + } + + /** + * Test la conversion des entités. + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportEntityImportString() throws IOException, TopiaException { + String data = "[1, 1, 1]\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "Zone:Zone test1\n" + + "0;0;0;42.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + List[] sems = new List[] { + Collections.singletonList(IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population")), + Collections.singletonList(IsisFishDAOHelper.getGearDAO(tx).findByName("Testengin")), + Collections.singletonList(IsisFishDAOHelper.getZoneDAO(tx).findByName("Zone test1")), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(42.0, m.getValue(0, 0, 0), 0.001); + } + + /** + * Test la conversion des entités. + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportEntity() throws IOException, TopiaException { + String data = "[1, 1, 1]\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "Zone:Zone test1\n" + + "0;0;0;42.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + List[] sems = new List[] { + Collections.singletonList(IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population")), + Collections.singletonList(IsisFishDAOHelper.getGearDAO(tx).findByName("Testengin")), + Collections.singletonList(IsisFishDAOHelper.getZoneDAO(tx).findByName("Zone test1")), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(42.0, m.getValue(0, 0, 0), 0.001); + } + + /** + * Test la conversion des entités et TimeStep + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportEntityTimeStep() throws IOException, TopiaException { + String data = "[1, 1, 2]\n" + + "Population:test population\n" + + "Gear:Testengin\n" + + "TimeStep:1,0\n" + + "0;0;0;1.0\n" + + "0;0;1;2.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + List[] sems = new List[] { + Collections.singletonList(IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population")), + Collections.singletonList(IsisFishDAOHelper.getGearDAO(tx).findByName("Testengin")), + Arrays.asList(new TimeStep(0), new TimeStep(1)), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(2.0, m.getValue(0, 0, 0), 0.001); + Assert.assertEquals(1.0, m.getValue(0, 0, 1), 0.001); + } + + /** + * Test la conversion des entités. + * @throws IOException + * @throws TopiaException + */ + @Test + public void testImportPopulationGroup() throws IOException, TopiaException { + String data = "[1, 3, 1]\n" + + "Population:test population\n" + + "PopulationGroup:test population+2,test population+1,test population+0\n" + + "Zone:Zone test1\n" + + "0;2;0;42.0"; + + TopiaContext tx = SimulationContext.get().getDB(); + + Population pop = IsisFishDAOHelper.getPopulationDAO(tx).findByName("test population"); + List[] sems = new List[] { + Collections.singletonList(pop), + Arrays.asList(pop.getPopulationGroup().get(0), pop.getPopulationGroup().get(1), pop.getPopulationGroup().get(2)), + Collections.singletonList(IsisFishDAOHelper.getZoneDAO(tx).findByName("Zone test1")), + }; + MatrixND m = MatrixFactory.getInstance().create(sems); + m.importCSV(new StringReader(data), null); + + Assert.assertEquals(42.0, m.getValue(0, 0, 0), 0.001); + } +} Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/JavadocHelperTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/util/ssh/SSHAgentTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java =================================================================== --- branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/java/fr/ifremer/isisfish/vcs/VCSSVNTest.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ @@ -1310,4 +1310,4 @@ Map<File, SVNStatus> statusFiles = vcs.getLocalStatus(file, true, SVNStatusType.STATUS_MISSING); Assert.assertEquals(1, statusFiles.size()); } -} \ No newline at end of file +} Modified: branches/4.0.1/src/test/resources/VCSConfig-junit_CVS.properties =================================================================== --- branches/4.0.1/src/test/resources/VCSConfig-junit_CVS.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/VCSConfig-junit_CVS.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of the +# published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-2.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### vcs.username=anonymous Modified: branches/4.0.1/src/test/resources/VCSConfig-junit_SVN.properties =================================================================== --- branches/4.0.1/src/test/resources/VCSConfig-junit_SVN.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/VCSConfig-junit_SVN.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of the +# published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-2.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### vcs.username=anonymous Modified: branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties =================================================================== --- branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_basic.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of the +# published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-2.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### #Parameters Modified: branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties =================================================================== --- branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/fr/ifremer/isisfish/simulator/parameters_plan.properties 2012-10-30 14:45:20 UTC (rev 3800) @@ -9,7 +9,7 @@ # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 2 of the +# published by the Free Software Foundation, either version 3 of the # License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -19,7 +19,7 @@ # # You should have received a copy of the GNU General Public # License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-2.0.html>. +# <http://www.gnu.org/licenses/gpl-3.0.html>. # #L% ### #Parameters Modified: branches/4.0.1/src/test/resources/mexico/mexicohelper_designplan.xml =================================================================== --- branches/4.0.1/src/test/resources/mexico/mexicohelper_designplan.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/mexico/mexicohelper_designplan.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -10,7 +10,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> <experimentalDesign> @@ -106,4 +106,4 @@ </domain> </factor> </factors> -</experimentalDesign> \ No newline at end of file +</experimentalDesign> Modified: branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV2.xml =================================================================== --- branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV2.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/mexico/mexicohelper_designplanV2.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,11 +6,11 @@ $Id$ $HeadURL$ %% - Copyright (C) 1999 - 2011 CodeLutin + Copyright (C) 1999 - 2012 Ifremer, CodeLutin %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> Modified: branches/4.0.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml =================================================================== --- branches/4.0.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/mexico/mexicohelper_factorgroupdp.xml 2012-10-30 14:45:20 UTC (rev 3800) @@ -10,7 +10,7 @@ %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation, either version 2 of the + published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see - <http://www.gnu.org/licenses/gpl-2.0.html>. + <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> @@ -152,4 +152,4 @@ </domain> </factor> </factors> -</experimentalDesign> \ No newline at end of file +</experimentalDesign> Modified: branches/4.0.1/src/test/resources/test-database/exports/Abundances.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/Abundances.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/Abundances.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/Biomasses.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/Biomasses.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/Biomasses.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/CapturesNombre.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/CapturesNombre.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/CapturesNombre.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/CapturesPoids.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/CapturesPoids.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/CapturesPoids.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/CellsDefinition.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/CellsDefinition.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/CellsDefinition.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/EffortsMetier.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/EffortsMetier.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/EffortsMetier.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/MetierZone.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/MetierZone.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/MetierZone.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/NonActivite.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/NonActivite.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/NonActivite.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/OwnerMargin.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/OwnerMargin.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/OwnerMargin.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/RegionDefinition.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/RegionDefinition.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/RegionDefinition.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/RejetsNombre.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/RejetsNombre.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/RejetsNombre.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/RejetsPoids.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/RejetsPoids.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/RejetsPoids.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/VesselMargin.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/VesselMargin.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/VesselMargin.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/exports/ZonesDefinition.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/exports/ZonesDefinition.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/exports/ZonesDefinition.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package exports; Modified: branches/4.0.1/src/test/resources/test-database/rules/Cantonnement.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/Cantonnement.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/Cantonnement.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/rules/CantonnementPreSimu.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/CantonnementPreSimu.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/CantonnementPreSimu.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/ChangementParamControlablePresimu.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/rules/EffortReduction.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/EffortReduction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/EffortReduction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/rules/GraviteVPUE1.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/GraviteVPUE1.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/GraviteVPUE1.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/rules/InterdictionEngin.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/InterdictionEngin.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/InterdictionEngin.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/InterdictionEnginPreSimu.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/rules/TACpoids.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/TACpoids.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/TACpoids.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/rules/TailleMin.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/TailleMin.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/TailleMin.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/rules/TotalClosure.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/rules/TotalClosure.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/rules/TotalClosure.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package rules; Modified: branches/4.0.1/src/test/resources/test-database/scripts/GravityModel.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/scripts/GravityModel.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/scripts/GravityModel.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/scripts/ResultName.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/scripts/ResultName.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/scripts/ResultName.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/scripts/RuleUtil.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/scripts/RuleUtil.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/scripts/RuleUtil.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package scripts; Modified: branches/4.0.1/src/test/resources/test-database/scripts/SiMatrix.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/scripts/SiMatrix.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/scripts/SiMatrix.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorJavaExpandGrid.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorJavaExpandGrid.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorJavaExpandGrid.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRDOptimal.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRDOptimal.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRDOptimal.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRExpandGrid.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRExpandGrid.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRExpandGrid.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRFast.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRFast.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRFast.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRFrF2.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRFrF2.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRFrF2.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRMorris.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRMorris.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRMorris.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorROptimumLHS.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorROptimumLHS.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorROptimumLHS.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRRandomLHS.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRRandomLHS.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRRandomLHS.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRSobol.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRSobol.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRSobol.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRegularFractions.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRegularFractions.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityanalysis/SensitivityCalculatorRegularFractions.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassReferenceY9.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeReferenceY12.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassRelativeY6.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityBiomassY3.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightReferenceY7.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightReferenceY7.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightReferenceY7.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightRelativeReferenceY10.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightRelativeY4.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightRelativeY4.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightRelativeY4.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightY1.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightY1.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivityCatchWeightY1.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassReferenceY8.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassRelativeReferenceY11.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassRelativeY5.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassY2.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassY2.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/sensitivityexports/SensitivitySpawningBiomassY2.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package sensitivityexports; Modified: branches/4.0.1/src/test/resources/test-database/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/simulationplans/CalibrationSimplexePasVariable2Capturabilite.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package simulationplans; @@ -482,4 +482,4 @@ } } -} \ No newline at end of file +} Modified: branches/4.0.1/src/test/resources/test-database/simulationplans/SimulationNumberRestriction.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/simulationplans/SimulationNumberRestriction.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/simulationplans/SimulationNumberRestriction.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ package simulationplans; Modified: branches/4.0.1/src/test/resources/test-database/simulators/DefaultSimulator.java =================================================================== --- branches/4.0.1/src/test/resources/test-database/simulators/DefaultSimulator.java 2012-10-30 10:49:07 UTC (rev 3799) +++ branches/4.0.1/src/test/resources/test-database/simulators/DefaultSimulator.java 2012-10-30 14:45:20 UTC (rev 3800) @@ -6,7 +6,7 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 2 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -16,7 +16,7 @@ * * You should have received a copy of the GNU General Public * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */